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

3346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Robertshaw
9d7a4e55f2 Menu frees any added items 2012-06-18 15:27:57 +01:00
Simon Robertshaw
741392f2c1 Free platent and elements 2012-06-18 15:25:24 +01:00
Simon Robertshaw
1a13c3edec Use C++ allocation and deletion for Brush memory 2012-06-18 14:46:18 +01:00
jacksonmj
ae5470ca78 Prevent stacking from ELEC+NEUT, ELEC+water, and CO2 from BUBW 
Also conserve number of particles when CO2 from BUBW is absorbed by
water, and when splitting water into H2+O2 using ELEC.
 2012-06-18 00:44:37 +01:00
jacksonmj
c14704ae49 Fix STKM causing stacking and falling through some powders 2012-06-17 23:54:47 +01:00
jacksonmj
06d2d5267e Correct freezing temperature for SLTW (-21.1 C) 2012-06-17 22:38:33 +01:00
Simon Robertshaw
4b073de82a Revert "Moved soap and stick men graphics things to special functions." 
This reverts commit 7f5408f196.

Conflicts:

	includes/powder.h
 2012-06-17 22:34:17 +01:00
jacksonmj
36de2f19f5 Move INST flood fill into a separate function 
Since there were so many if statements for INST in flood_parts. Also, allow
INST inside walls to be sparked.
 2012-06-15 13:45:55 +01:00
jacksonmj
e7fabd8601 Fix bug with the improvement to text wrapping 
Cursor was sometimes in the wrong place
 2012-06-14 11:56:40 +01:00
jacksonmj
1f05aa7f21 Minor improvement to text wrapping 
When text flows onto a new line, don't put the space between words at
the start of the new line.
 2012-06-14 01:13:17 +01:00
Simon Robertshaw
2717a17127 Use SDL by default 2012-06-13 20:49:41 +02:00
chaos.powdertoy.co.uk
bf8435bf81 Version Increment 2012-06-13 19:28:56 +01:00
Catelite
a83a995f23 Added a tmp=1 flag to PLNT so that VINE will actually function like intended when VINE_MODE is disabled. Plant touching wood is unaffected, but vine that touches wood will grow. 2012-06-13 18:28:27 +01:00
Catelite
12cf2a3145 Updated FRZZ element to behave somewhat like SNOW, since it has roughly the same physical properties. Also changed its element description, since it actually appears on a menu. Leftover FRZZ will eventually become ICE if touching ICE with FRZW ctype. 2012-06-13 18:28:13 +01:00
Simon Robertshaw
9769239af6 Remove debug printing from brush 2012-06-13 15:09:37 +01:00
Simon Robertshaw
2b51441573 Linux fix with SDL_syswm 2012-06-13 14:54:15 +01:00
Simon Robertshaw
d7e12b7b43 Missing includes and declarations for Linux 2012-06-13 14:36:56 +01:00
Catelite
a104696620 Update to EXOT that makes it permeable to neutrons as well as electrons. Neutrons cause a water>distilled water spread that enables EXOT's copy function, at its original speed. Electrons reset mode, but not tmp2. Trippy monochrome colors for copy mode. 
Conflicts:

	src/elements/exot.c
 2012-06-13 13:51:24 +01:00
Simon Robertshaw
c447dd2f4a TPT: Update version 2012-06-13 01:40:44 +01:00