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

3762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacksonmj
eea006ad6f SConscript changes from Doxin - option for scons to copy environment variables CC, CXX, LD, CFLAGS 2013-10-19 14:03:37 +01:00
jacob1
6edb96ee51 fix bottom row of saves in the save browser being cut off 2013-10-18 16:57:53 -04:00
jacob1
fd6da26b73 fix not being able to select / see all elements in menus with tons of elements 2013-10-18 16:36:37 -04:00
jacob1
ba43e4d238 revert b17ef7f938 (couldn't figure out better fix for the new PSTN bug), fix annoyance with clicking on save comments changing pages 2013-10-18 16:13:40 -04:00
jacksonmj
02a4c17d72 Ignore invalid walls in some old saves, so that they load correctly 
E.g. save 10631 from old server
 2013-10-17 16:09:38 +01:00
jacksonmj
132755525c Fix incorrect search page count 2013-10-17 16:09:28 +01:00
jacob1
c4dcb37de4 PROT with 0 life doesn't die 2013-10-10 17:13:11 -04:00
jacob1
d1e75c7a50 make PROT lasers easier to make, adjust velocities needed to make things when smashing PROT together, use FIRE_BLEND for PROT graphics 2013-09-28 20:31:35 -04:00
jacob1
8fc39d659c VIRS only burns with PLSM, and has the NO_DECO graphics flag 2013-09-28 19:45:15 -04:00
jacob1
13d89ce9e1 Fix tpt.get_numOfParts, add "C" next to temperature in HUD 2013-09-28 16:58:01 -04:00
jacob1
c480c9ea19 Merge branch 'HEAD' of https://github.com/FacialTurd/The-Powder-Toy.git 2013-09-27 17:41:46 -04:00
jacob1
48f1adb038 fix min and max in VS2013 2013-09-27 17:39:16 -04:00
jacksonmj
ceca61114a Fix crash when trying to convert StringType to PointType 2013-09-27 19:41:12 +01:00
jacob1
44b7c4f8f4 Merge pull request #168 from liquidcaesium/patch-2 
Decimal number support
 2013-09-27 08:53:53 -07:00
liquidcaesium
65640ee6af Decimal number support 2013-09-27 18:52:47 +03:00
jacob1
bc6a380c4c Merge pull request #165 from liquidcaesium/patch-1 
LCRY + PROT = LCRY + PHOT
 2013-09-24 08:03:02 -07:00
liquidcaesium
a376b72b36 LCRY + PROT = LCRY + PHOT 
Protons passing through active LCRY get turned into photons slowly, functioning as a powered converter in that manner.
 2013-09-24 17:58:35 +03:00
jacob1
13309379f9 add a --fullclean option to fix errors (from Doxin) 2013-09-24 10:07:22 -04:00
jacob1
a5c1a08d2c Merge pull request #163 from ryanmjacobs/patch-2 
Corrected comment grammar.
 2013-09-22 16:29:59 -07:00
ryanmjacobs
750e62b31b Corrected comment grammar. 
line 692 before: "<p>set a defaukt target</p>"
line 692 now: "<p>set a default target</p>"
 2013-09-21 18:56:18 -07:00
jacksonmj
ef6cc9c418 WIFI: always delay one frame before conducting, to prevent particle order issues 2013-09-21 13:18:27 +01:00
jacksonmj
ce277a11f1 Forgot HUD description for FILT tmp=9 2013-09-15 15:44:01 +01:00
jacob1
e578b9f799 fix BIZS melting without heat sim on (I wonder how many more elements still do this ...) 2013-09-14 19:13:29 -04:00
jacob1
cf45b24a30 update version number 2013-09-14 11:15:52 -04:00
jacob1
c6ba381424 make PROT more red, and VIRS burns less 2013-09-14 10:26:23 -04:00
jacob1
ee093ae3b7 disable PHOT+H2 reaction during fusion 2013-09-14 09:49:19 -04:00
jacob1
e1b26346a1 ensure VIBR always eats PROT 2013-09-13 22:24:50 -04:00
jacob1
ae8e5e5c34 PROT+DEUT causes DEUT implosion (same as with NEUT, just negative pressure) 
Also PHOT+H2 now also make PROT+ELEC (which will not combine to make more H2)
 2013-09-13 22:02:03 -04:00
jacob1
830bb3ba5e fix !load -1 crash 2013-09-13 12:53:40 -04:00
jacob1
aa2ec3d162 fix SOAP crashes by making sure particle id's are between 0 and NPART. Also cut off .life to between 0 and 65535 when saving 2013-09-12 14:35:10 -04:00
jacob1
074a2226e1 remove useless and laggy lightning_recreate check 2013-09-11 21:41:54 -04:00
jacob1
332aa25bf6 save pavg[] in saves, for VIRS, PIPE, and STOR 2013-09-11 20:41:43 -04:00
jacob1
09c54b596b Merge pull request #158 from mniip/x11-clipboard 
X11 clipboard pull
 2013-09-11 13:51:32 -07:00
jacksonmj
9eccad80b1 Missing breaks in readOPS 
Causing some elements to be loaded incorrectly
 2013-09-08 18:14:12 +01:00
jacksonmj
2e52e209a6 CRAY: only set decoration colour after passing through FILT 2013-09-08 17:33:12 +01:00
jacksonmj
45dc8ac757 Revert "Don't reset decorations when sparking with INWR+CRAY(most things)" 
This reverts commit 5ad67f7778.
 2013-09-08 17:28:51 +01:00
jacksonmj
7270461985 Enabled check for PIPE too 2013-09-08 11:52:44 +01:00
jacksonmj
5ad67f7778 Don't reset decorations when sparking with INWR+CRAY(most things) 
INWR+CRAY(SOAP) will reset decorations
 2013-09-08 11:30:21 +01:00
jacksonmj
79edfe9589 Include elements[].Enabled in check for invalid lava ctype 2013-09-08 09:26:31 +01:00
mniip
8d96f3f6b6 fix segfault on wordwrapping a string with a character >=128 2013-09-06 13:09:24 +01:00
jacob1
d9089d13c4 fix BCOL melting and not burning when heat sim is off 2013-09-05 14:45:47 -04:00
jacksonmj
96221ff23e Make effect of PROT on wifi and portals independent of channel temperature ranges 
Cold PROT decreases channel by 1, v cold by 10. Hot PROT increases channel by 1, v hot by 10.
Since the effect is specified in terms of effect on channel number not on temperature, this will
cause less problems if the temperature gap is ever decreased to add more channels.
 2013-09-05 18:06:13 +01:00
jacob1
7d9fa1bfc7 new element: VIRS (also solid and gas virus states). Cured by SOAP (CURE element was not added) 2013-09-04 00:20:21 -04:00
jacob1
6c4f63be3b proton collision reaction (might need to be modified). Also some ways to go to/from protons 2013-09-02 21:58:52 -04:00
jacob1
1b9d852fc6 Merge pull request #159 from mniip/stamps 
fix resizing in VideoBuffer::Resize, fixes #121
 2013-09-02 08:03:55 -07:00
mniip
fea920d608 fix fixedRatio when VideoBuffer::Resize'ing, fixes #121 2013-09-02 18:03:43 +04:00
jacob1
f1145f31f5 new element: PROT (protons) TODO: proton colliders to produce heavier elements 2013-09-01 21:52:38 -04:00
jacob1
b2957dc1c9 ability to use Celcius and Farenheit in console 2013-08-29 23:37:57 -04:00
jacob1
a5cee8c393 alternate keys: semicolon for replace mode, ctrl+semicolon for specific delete (also couldn't figure out how to detect mac delete key) 2013-08-29 23:01:07 -04:00
jacob1
fd586d167f fix bug where when sparks were reset, ctype wasn't 2013-08-29 22:44:38 -04:00