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

3215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Robertshaw
009de99f02 Prevent tool buttons being drawn off the edge of the window when scrollable 2012-06-23 00:48:01 +01:00
Simon Robertshaw
6352888c68 Menu scrolling 2012-06-23 00:34:08 +01:00
jacksonmj
81771d8672 Completely remove SING formation from fusion 2012-06-23 00:24:36 +01:00
jacksonmj
29aab750e5 Only create one NBLE particle for each fusing H2 particle 2012-06-23 00:10:39 +01:00
Jacob1
287822229f fix compression during fusion 
Conflicts:

	src/powder.c
 2012-06-23 00:10:39 +01:00
jacksonmj
135e91b84d Reset particle flags in create_part 2012-06-23 00:10:39 +01:00
jacksonmj
95ca29cc64 Allow stickman head to go through everything 2012-06-23 00:03:50 +01:00
Simon Robertshaw
333509842d Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-22 19:04:55 +01:00
Simon Robertshaw
eb52f759de Success/Failure return from Asyn Task, Prompt to visit website upon update failure 2012-06-22 19:04:38 +01:00
Bryan Hoyle
6fa05d1930 Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-22 12:00:17 -04:00
Bryan Hoyle
58f3494f6f Fixed invalid pointer cast 2012-06-22 12:00:00 -04:00
Simon Robertshaw
55d90a44a8 Remove debug code from onDraw 2012-06-22 16:36:02 +01:00
Simon Robertshaw
beee75d9d1 Multiple pages of comments 2012-06-22 16:35:32 +01:00
Simon Robertshaw
e6e23669ee Scrollable comments 2012-06-22 15:13:24 +01:00
jacksonmj
31a61d0888 Prevent STKM floating in gases 2012-06-22 14:14:54 +01:00
Simon Robertshaw
2e48bd149c Stage 2 of autoupdate working 2012-06-22 01:44:30 +01:00
Simon Robertshaw
3c91e526bb Client now provides methods for reading and saving preferences - less powerful than raw access to Cajun, (no mixed type arrays, for example) but allows other save formats to be used, such as property lists on OS X 2012-06-22 01:04:55 +01:00
Simon Robertshaw
550f6e28e0 Stage 1 of update process completed 2012-06-21 15:49:32 +01:00
jacksonmj
31ce22f122 Gravity modes and Newtonian gravity for fireworks 
Resolves issue #59
 2012-06-21 13:58:35 +01:00
Simon Robertshaw
8fc3325b1c Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-21 13:23:04 +01:00
Simon Robertshaw
12ba6834eb Make status updates on tasks safe - add intermediate progress bar for TaskWindow 2012-06-21 13:22:52 +01:00
jacksonmj
ded23cfa94 Fix minor bug with deco sample tool 
If particles are not being drawn with blendpixel, then it is possible for the
R/G/B component of a pixel to be 255. Adding 1 gives 256, which does not
produce the right colour when combined into a RRGGBB value
 2012-06-21 11:06:27 +01:00
jacksonmj
79614a9719 Use eval_move(PT_FIGH, ...) when fighters are checking for obstacles 
Also stop fighters being included in the stacking check
 2012-06-20 22:40:08 +01:00
jacksonmj
fed8b7b2cc Save an extra tmp2 byte, for EXOT 2012-06-20 22:21:10 +01:00
jacksonmj
1d5b081942 Replace all explosion sparks with new element (EMBR) 
Replaces: BOMB sparks and flash, electrons + glass sparks, sparks from
IGNC, sparks from TNT explosion, and sparks from FWRK and FIRW.
 2012-06-20 22:15:45 +01:00
Bryan Hoyle
df13d96335 Forgot to actually add it 2012-06-20 15:13:18 -04:00
Bryan Hoyle
f5aeaf1038 And, standard powder-opengl for quick testing compiles 2012-06-20 15:12:44 -04:00
Bryan Hoyle
3b29a74767 fixes to code and a option for opengl building for release 2012-06-20 15:05:25 -04:00
Bryan Hoyle
b6afd854d0 Reverting makefile 2012-06-20 14:48:34 -04:00
Bryan Hoyle
c775126272 Merging 2012-06-20 14:45:06 -04:00
Simon Robertshaw
09758b9152 SaveRenderer returns a placeholder thumbnail in case of OpenGL 2012-06-20 19:43:03 +01:00
Bryan Hoyle
e5e638448c remove some debugging 2012-06-20 14:42:42 -04:00
Bryan Hoyle
9953f4518e Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-20 14:41:17 -04:00
Simon Robertshaw
ad76b293d8 Make Confirm dialogue less ugly 2012-06-20 19:39:33 +01:00
Bryan Hoyle
b35255b722 Renders an X in place of save icons, atm. 2012-06-20 14:25:41 -04:00
Bryan Hoyle
c9f837f21d Opengl can open saves now, just need to get it to render accurately later 2012-06-20 14:23:22 -04:00
Simon Robertshaw
0594aa5d07 More in the way of an autoupdater 2012-06-20 17:51:51 +01:00
Simon Robertshaw
088b2f678d localBrowserModel should be browserModel 2012-06-20 16:26:14 +01:00
Simon Robertshaw
e81e18238d Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-20 13:40:34 +01:00
Simon Robertshaw
2be9c92508 OpenGL canvas for Windows, Notifications for main Game, Update checker in Client (+ other client triggered events) 2012-06-20 13:40:18 +01:00
jacksonmj
9b2c2a78a6 Make ELEC+water form H2 and O2 in the correct proportions 2012-06-18 22:47:38 +01:00
Simon Robertshaw
f6403958de Fix stamp and save assignment 2012-06-18 18:06:40 +01:00
Simon Robertshaw
8c608ee8b9 Use C++ allocation/freeing for text masking and multiline processing 2012-06-18 17:07:27 +01:00
Simon Robertshaw
7ffaa421d1 GameModel manages currentSave instance 2012-06-18 16:43:40 +01:00
Simon Robertshaw
5e301ba17c Controllers should free their callbacks and views 2012-06-18 16:21:13 +01:00
Simon Robertshaw
83ccd65b14 Don't rely on Window class freeing for components that may not be added 2012-06-18 16:00:34 +01:00
Simon Robertshaw
1fceab6e4a Ensure partsSimIndex is freed upon success state of OPS parsing 2012-06-18 15:57:41 +01:00
Simon Robertshaw
fc86c24027 Better freeing for memory in GameSave 2012-06-18 15:54:55 +01:00
Simon Robertshaw
81423ba568 RenderOptions controller should delete its callback 2012-06-18 15:45:31 +01:00
Simon Robertshaw
edac8b5481 Free tools 2012-06-18 15:32:15 +01:00