matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,065 Commits 13 Branches 426 Tags 113 MiB
2adea2f7e3
Commit Graph

2065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Robertshaw
394a0e9ee0 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-18 14:58:09 +00:00
Simon Robertshaw
d94914040b Portal In/Out effects 2011-11-18 14:57:49 +00:00
savask
aac78386ff Radio buttons for some options. 
Conflicts:

	src/interface.c
 2011-11-18 21:54:50 +07:00
Jacob1
f135dbb734 Added back heat gradient display 2011-11-18 14:44:58 +00:00
Jacob1
f2759c7f2c Better looking icons in render_ui 2011-11-18 14:28:20 +00:00
Jacob1
8f493b62c3 Add blob display back. Also fix small nothing mode bug. 2011-11-18 14:15:49 +00:00
Jacob1
2d1a0d474f Add back in number keys to change render/display/color _mode variables 2011-11-18 14:13:50 +00:00
chaos.powdertoy.co.uk
c5e19c6a66 Version Increment 2011-11-14 17:38:49 +00:00
Simon Robertshaw
dd5e9f8376 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-14 17:38:25 +00:00
Simon Robertshaw
dd10e780d6 Fix decorations 2011-11-14 17:38:08 +00:00
chaos.powdertoy.co.uk
49e7d1d9d2 Version Increment 2011-11-14 16:48:09 +00:00
Simon Robertshaw
33ac464441 Saving and loading for graphics modes 2011-11-14 16:41:01 +00:00
Simon Robertshaw
9dd0f24667 More stuff for render_uI 2011-11-14 14:26:50 +00:00
Simon Robertshaw
cef8dfa517 Colour mode and display mode added to render_ui 2011-11-14 11:11:25 +00:00
Simon Robertshaw
c63dff45e4 Basic render modes for Render_ui 2011-11-13 21:02:46 +00:00
Simon Robertshaw
0f4c0915d9 Replace cmode with more flexible render options, TODO: Saving and render options UI 2011-11-12 20:44:15 +00:00
Simon Robertshaw
1b984200f3 Grid Mode 2011-11-12 17:25:21 +00:00
Simon Robertshaw
bca76b0796 Trim down UItext, remove Generations and Version 2011-11-12 16:37:01 +00:00
Simon Robertshaw
ee72977da8 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-12 16:24:39 +00:00
Simon Robertshaw
2bd9d61ab5 Listbox for Property tool property field 2011-11-12 16:24:21 +00:00
Simon Robertshaw
b9f15e16cc open_ui: Load correct thumbnail for dated saves 2011-11-12 14:19:10 +00:00
savask
73460283a2 "Pipe with ..." message when pipe is filled. 2011-11-12 21:07:19 +07:00
Simon Robertshaw
859022ccb1 Fix memory leaks and thumb caching for datestamped saves 2011-11-12 13:55:18 +00:00
Simon Robertshaw
9b4e3b9436 Merge pull request #51 from atlaua/master 
todo resolved
 2011-11-12 04:50:25 -08:00
jacksonmj
5b9faa39c0 Fix a few things in stamps browser 
Incorrect number of stamps per page, pause button visible, and one page
too many when stamp_count is an integer multiple of per_page.

Using GRID_X/Y since those are the values used in the rest of stamp_ui
 2011-11-12 20:46:47 +08:00
jacksonmj
05fbb92420 Make PIPE reset (ready to generate pattern) when ctype is cleared and life is 0 2011-11-12 20:46:47 +08:00
Simon Robertshaw
93dc4cc477 Update src/main.c 2011-11-12 12:42:08 +00:00
chaos.powdertoy.co.uk
a3a9af4b6e Version Increment 2011-11-09 14:17:31 +00:00
chaos.powdertoy.co.uk
aade1ff2e2 Version Increment 2011-11-08 22:59:04 +00:00
Simon Robertshaw
c983de144d Cursor in ZooM 2011-11-08 12:35:07 +00:00
Simon Robertshaw
bc2b5e7945 Pixel grid for Zoom 2011-11-08 12:16:13 +00:00
Simon Robertshaw
093cc6281c Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-04 21:34:03 +00:00
Simon Robertshaw
b71214b8cf MSVC compatibility 2011-11-04 21:33:44 +00:00
chaos.powdertoy.co.uk
d43740feca Version Increment 2011-11-04 16:11:02 -04:00
Simon Robertshaw
6615fbca03 Fix shader compilation for ATi and Intel 2011-11-04 20:07:51 +00:00
atlaua
ae26ecaf8d Prevented a malloc-related problem in interface.c from occuring. 2011-11-03 19:25:49 +01:00
atlaua
e084d91b55 Resolved a todo in main.c 2011-11-03 14:24:20 +01:00
chaos.powdertoy.co.uk
85c638bf71 Version Increment 2011-11-02 16:24:41 -04:00
Simon Robertshaw
cfb8ec7af5 Error logging for shader compilation 2011-11-02 20:24:04 +00:00
Simon Robertshaw
640d4e9e3a Fix Air inversion 2011-11-02 19:37:52 +00:00
savask
7de6526a1e CAUS now kills stick man. Also stick mans can have gas power now. 2011-11-02 22:22:27 +07:00
chaos.powdertoy.co.uk
f53fdaa1c2 Version Increment 2011-11-02 06:42:50 -04:00
Simon Robertshaw
9c26ef45b6 OpenGL headers for OS X in graphics.c 2011-11-02 10:39:48 +00:00
Simon Robertshaw
3723147a1d ACEL and DCEL, need to be in a better section 2011-11-01 20:44:49 +00:00
Simon Robertshaw
b0458bd5fa OpenGL on Windows 2011-11-01 19:29:13 +00:00
Simon Robertshaw
4f74cfa35d Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-01 19:17:04 +00:00
Simon Robertshaw
91f4a156df Revert "OpenGL Windows" 
This reverts commit 59cfce567f.
 2011-11-01 19:16:46 +00:00
Simon Robertshaw
59cfce567f OpenGL Windows 2011-11-01 19:13:50 +00:00
savask
98e23875c8 Fixes for stick mans in heat mode. 2011-11-01 23:44:44 +07:00
savask
9ac04e2c18 Right color for air stick man. 2011-11-01 23:44:31 +07:00