Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments

Snippets Groups Projects

e7bfbdb6

Commit e7bfbdb6 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'fbo_mrt' into 'master'

Fbo mrt

for after 1.3

parents 2d6ea48e 8cd13955

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/data/gfx/ui/empty-ui.png 0 additions, 0 deletions

game/engines/default/data/gfx/ui/empty-ui.png
game/engines/default/engine/colors.lua 1 addition, 0 deletions

game/engines/default/engine/colors.lua
game/engines/default/engine/generator/map/Rooms.lua 1 addition, 0 deletions

game/engines/default/engine/generator/map/Rooms.lua
src/core_lua.c 50 additions, 17 deletions

src/core_lua.c
src/core_lua.h 3 additions, 1 deletion

src/core_lua.h
src/particles.c 1 addition, 1 deletion

src/particles.c
src/shaders.c 83 additions, 21 deletions

src/shaders.c

with 139 additions and 40 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment