cracker64
|
de6bb6a960
|
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
|
2013-03-03 17:08:36 -05:00 |
|
jacob1
|
8b83ae9f95
|
PSTN ctype sets the element that stops it, FRME with a tmp of one is non-sticky (doesn't pull)
|
2013-03-03 16:36:37 -05:00 |
|
cracker64
|
5e1c7d7932
|
Some better comments in SPRK, renamed rt and ct.
|
2013-03-03 16:30:34 -05:00 |
|
cracker64
|
bb87299eb4
|
Missed one SPRK case.
|
2013-03-02 20:07:17 -05:00 |
|
jacob1
|
846d7d8064
|
allow NEUT to travel through ICE and SNOW, and for it to turn OIL to GAS (both like inextremely old versions)
|
2013-03-02 19:07:00 -05:00 |
|
cracker64
|
85cb4b37c9
|
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
|
2013-03-02 00:42:17 -05:00 |
|
cracker64
|
d58100dc07
|
More fixes, redid a bunch of SPRK, so far everything I've tested works fine.
|
2013-03-02 00:42:07 -05:00 |
|
jacob1
|
cd18515e0a
|
piston retraction now checks pmap
|
2013-03-01 23:06:02 -05:00 |
|
cracker64
|
a9f4b5fe34
|
Quick fix for IRON
|
2013-03-01 00:55:10 -05:00 |
|
cracker64
|
0d70547cf0
|
More fixes to fix fixes and new fixes to fix stuff.
|
2013-03-01 00:41:53 -05:00 |
|
cracker64
|
5873d69586
|
Going through again.
|
2013-02-28 12:37:16 -05:00 |
|
cracker64
|
c65081d3ed
|
Finished first pass-through for all elements.
Will get a few more places later.
|
2013-02-28 00:40:36 -05:00 |
|
cracker64
|
08d1a68ce0
|
More fixes.
|
2013-02-27 17:20:05 -05:00 |
|
cracker64
|
3d2e594150
|
Small modifications part three.
|
2013-02-27 12:08:10 -05:00 |
|
cracker64
|
27e3e12518
|
Small optimizations number 2.
|
2013-02-27 00:11:23 -05:00 |
|
cracker64
|
8250515e97
|
Lots of small optimizations and things, nothing should be functionally different.
Only gotten through a few elements, more later.
|
2013-02-26 18:59:37 -05:00 |
|
jacksonmj
|
5c2f310577
|
Make default DCEL exactly reverse the effect of default ACEL
|
2013-02-25 01:05:12 +00:00 |
|
Simon Robertshaw
|
8dfb1ecf87
|
ACEL and DCEL use life for strength value
|
2013-02-24 11:50:10 +00:00 |
|
jacob1
|
6b1e99a731
|
allow ACEL and DCEL strength to be modified with ctype
|
2013-02-23 23:45:40 -05:00 |
|
jacob1
|
20d8eff7f5
|
remove uneeded PSTN check, fix PSTN not retracting sometimes, fix PSTN bug where is wouldn't properly tell the difference between PSTN and PSTN arms
|
2013-02-22 16:50:33 -05:00 |
|
jacob1
|
11f45e3e99
|
CRAY spawns elements at its temp, fix color glitch with ARAY too, move FRME to force
|
2013-02-22 11:54:32 -05:00 |
|
jacob1
|
40c4289ce8
|
fix CRAY(SPRK) bugs, make CRAY act more like before again
|
2013-02-22 00:19:12 -05:00 |
|
jacob1
|
3da733b027
|
fix PSTN bugs where FRME would still move even if all of it couldn't, fix PSTN going through walls, fix bug where the PSTN extention may not be created in some glitched cases
|
2013-02-21 23:35:44 -05:00 |
|
jacob1
|
2184d35b28
|
reset colored and partsRemaining, to fix bugs when CRAY is sparked multiple times at once
|
2013-02-20 21:11:50 -05:00 |
|
jacob1
|
74387040a1
|
fix CRAY INST mode ignoring length, fix CRAY going ignoring walls, fix CRAY + GOL particles, allow CRAY to create sparks
|
2013-02-20 18:36:00 -05:00 |
|
jacob1
|
a3454c49be
|
fix CRAY only deleting odd numbered elements
|
2013-02-16 15:11:59 -05:00 |
|
jacob1
|
8e02443f0a
|
prevent CRAY from destroying DMND
|
2013-02-01 14:29:18 -05:00 |
|
Simon Robertshaw
|
486d26e40b
|
Allow limited arm size from tmp2
|
2013-01-26 19:44:05 +00:00 |
|
Simon Robertshaw
|
03fde95719
|
Fix issue where piston won't push particles at index 0
|
2013-01-26 18:56:19 +00:00 |
|
Simon Robertshaw
|
631e49b8b7
|
Piston fix: Adjust colour and prevent piston from pushing too far when there's empty space
|
2013-01-26 18:04:24 +00:00 |
|
Simon Robertshaw
|
12e3802bf4
|
Put back default piston size
|
2013-01-26 17:16:58 +00:00 |
|
Simon Robertshaw
|
8e689fdd08
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2013-01-26 17:15:02 +00:00 |
|
Simon Robertshaw
|
3e60181dbe
|
Piston collapses spaces properly
|
2013-01-26 17:14:44 +00:00 |
|
jacob1
|
ea38fc2d86
|
fix possible crash with LIGH
|
2013-01-23 21:54:15 -05:00 |
|
Simon Robertshaw
|
7475a49e0b
|
Fix piston retraction
|
2013-01-23 19:52:45 +00:00 |
|
Simon Robertshaw
|
6c89c63a44
|
PSTN: Do not accept current from diagonals, increase distance for spark checks
|
2013-01-23 19:20:52 +00:00 |
|
Simon Robertshaw
|
0034dd654e
|
Fix FRME limits
|
2013-01-23 19:17:11 +00:00 |
|
Simon Robertshaw
|
412e13a03e
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2013-01-23 12:39:08 +00:00 |
|
Simon Robertshaw
|
da12cc6d46
|
Change to pistons, piston push length is base-1 blocks
|
2013-01-23 12:38:53 +00:00 |
|
Simon Robertshaw
|
a7aa26fa1a
|
Added FRME - A solid that keeps its simple structure when pushed by piston
|
2013-01-23 12:36:31 +00:00 |
|
Simon Robertshaw
|
00cf48b520
|
Fully functional pistons, retract+extend
|
2013-01-23 12:06:06 +00:00 |
|
jacob1
|
07aade6c4c
|
fix crash when pressing enter to open a save, and not logged in. Fix CRAY description
|
2013-01-23 00:26:57 -05:00 |
|
Simon Robertshaw
|
28fdb32bfb
|
Clean up some unused variables from PSTN.cpp
|
2013-01-22 22:42:52 +00:00 |
|
jacob1
|
392271a269
|
fix tpt.set_property setting integers above 255, fix fs.isDir/File, add "Color" as valid property for elements api, fix tpt.display_mode to match tpt, other minor changes
|
2013-01-21 20:19:34 -05:00 |
|
Simon Robertshaw
|
9fb3e75f93
|
PSTN.cpp - Remove unused code
|
2013-01-20 23:08:50 +00:00 |
|
Simon Robertshaw
|
fde0233ea8
|
Pistons - WIP, No retraction yet
|
2013-01-20 23:08:16 +00:00 |
|
Simon Robertshaw
|
87d6553413
|
C-RAY: Similar to A-RAY, creates particles
|
2013-01-20 14:34:07 +00:00 |
|
cracker64
|
b3037857f0
|
Detach soap before going into STOR, fixes 1065982 (mostly)
|
2013-01-11 23:06:42 -05:00 |
|
jacob1
|
0cf027c529
|
VOID, VACU, and BHOL eat LIGH as it moves
|
2013-01-05 22:29:33 -05:00 |
|
jacob1
|
bd3011959a
|
fix GOL detection with DTEC
|
2013-01-05 19:34:51 -05:00 |
|
jacob1
|
b6e69e8126
|
Fix small mistake in TSNS
|
2012-12-21 00:18:10 -05:00 |
|
jacob1
|
9a2df6b824
|
fix sltw + liquid rubiduim explosion, make it work like water's
|
2012-12-18 15:17:57 -05:00 |
|
jacob1
|
b236c75209
|
make TSNS not detect METL, some other sensor and CONV fixes
|
2012-12-18 14:55:10 -05:00 |
|
jacob1
|
b5de23433d
|
fix '=' resetting air heat, fix uninitialized ambient heat setting, a few LOLZ / LOVE changes
|
2012-12-17 21:11:33 -05:00 |
|
jacob1
|
2728cf852b
|
fix WARP being invisible, make it visible in heat display mode though
|
2012-12-17 20:08:46 -05:00 |
|
jacob1
|
f08481a88e
|
fix TRON ignoring GOO until the last moment
|
2012-12-17 18:42:41 -05:00 |
|
jacksonmj
|
e4907d1881
|
Copy dcolour when MERC expands, to let people make coloured mercury thermometers
|
2012-12-16 00:16:05 +00:00 |
|
Simon Robertshaw
|
e5feefa419
|
Update WIRE name and description, fixes #101
|
2012-12-14 18:50:25 +00:00 |
|
jacob1
|
226de5b6f8
|
add back element descriptions in some cpp files, fix minor TRON search problem. Also,
TPT-jacksonmj: Also fix bugs with energy particles that pass directly from PIPE to portal
|
2012-12-06 19:51:33 -05:00 |
|
jacob1
|
a15372afbf
|
TRON_NORANDOM flag
|
2012-12-06 18:42:46 -05:00 |
|
jacob1
|
2881eeb1b3
|
allow TRON to plan ahead which particles will disappear by the time it gets there, and go on INVS too
|
2012-12-06 17:53:22 -05:00 |
|
jacob1
|
122599763e
|
Merge remote-tracking branch 'origin/master'
|
2012-12-06 11:01:46 -05:00 |
|
jacob1
|
2d7ac84c1d
|
give TRON the ability to go through activated SWCH
|
2012-12-06 10:56:24 -05:00 |
|
jacksonmj
|
9bf5eeeef9
|
Fix slight particle order issue with SWCH
|
2012-12-04 19:38:01 +00:00 |
|
jacob1
|
2a8811190c
|
Fix infinite pressure glitch with CLST
|
2012-12-01 12:17:41 -05:00 |
|
jacob1
|
6a4040f2b7
|
Update src/simulation/elements/VIBR.cpp
fix EXOT destroying exploding VIBR
|
2012-11-23 21:28:10 -05:00 |
|
jacob1
|
7a21ae192f
|
VINE cool/burn effects like in PLNT, less sharp burn lines, fix infinite smoke from TNT
|
2012-11-16 23:35:34 -05:00 |
|
jacob1
|
16e4c5f717
|
save pause state in stamps, load pause state from local saves and stamps correctly, remove accidental inclusion
|
2012-11-15 20:41:38 -05:00 |
|
jacob1
|
1e32c545d9
|
fix visual studio std::max problem
|
2012-11-15 20:23:38 -05:00 |
|
jacksonmj
|
fbbe9d81bf
|
Transfer energy between VIBR and BVBR
|
2012-11-05 21:45:22 +00:00 |
|
jacksonmj
|
7da144fbae
|
Fix INVS staying dark blue even when pressure is removed
|
2012-11-05 14:45:46 +00:00 |
|
jacksonmj
|
956fb39124
|
Oops, didn't see that parts[i].temp at the bottom, ignore the second half of that last commit message
|
2012-11-05 14:42:06 +00:00 |
|
jacksonmj
|
3cae63c733
|
VIBR: don't dump heat into elements that don't conduct heat, and put any remaining heat into EXOT at the end of the explosion
|
2012-11-05 14:18:28 +00:00 |
|
jacob1
|
dc41e46c81
|
fix two red BRAYS not being able to turn off swch from certain angles
|
2012-11-04 22:44:49 +00:00 |
|
jacob1
|
ca42162e5e
|
fix heat release during explosion
|
2012-11-04 21:35:35 +00:00 |
|
jacksonmj
|
12eb085d20
|
VIBR changes from jacob1
Including:
Molten TTAN + EXOT = VIBR.
VIBR + ANAR = BVBR. (BOYL reaction removed)
All absorbed heat/particles/pressure are stored in one property, tmp.
Graphics changes
|
2012-11-04 20:35:43 +00:00 |
|
jacob1
|
d586a6d0ab
|
PPIP doesn't break with pressure, to match TPT
|
2012-11-03 16:11:54 +00:00 |
|
jacksonmj
|
2ed53a99ae
|
Change EXOT properties to match TPT
|
2012-11-03 16:11:11 +00:00 |
|
Bryan Hoyle
|
32bdcb89e8
|
VIBR fixes
|
2012-10-28 21:11:18 -04:00 |
|
jacksonmj
|
caf262ed60
|
Decrease absorption chance for SPNG, to make release of water from saturated SPNG look a bit less strange
|
2012-10-27 00:56:02 +01:00 |
|
jacksonmj
|
9a0ca32372
|
Make conversion of PHOT to ELEC using BIZR, and enrichment of DEUT with ELEC, work better
|
2012-10-27 00:56:02 +01:00 |
|
Simon Robertshaw
|
9b4f710e28
|
Menu icon for sensors menu and fix for VIBR std::max args
|
2012-10-26 15:58:39 +01:00 |
|
Simon Robertshaw
|
a1d98ffc31
|
Fix BVBR for generate.py
|
2012-10-26 15:29:55 +01:00 |
|
jacob1
|
6d6b0dfa9f
|
some VIBR changes, also allow it to be compiled with Scons
|
2012-10-26 15:18:52 +01:00 |
|
Simon Robertshaw
|
63daf67d44
|
Improve EXOT description
|
2012-10-26 15:14:57 +01:00 |
|
jacob1
|
6d1c7be740
|
initialize all stickmen variables, not just legs
|
2012-10-26 15:13:27 +01:00 |
|
jacob1
|
4d207b1146
|
fix INVS graphics
|
2012-10-26 15:12:21 +01:00 |
|
jacob1
|
947660fcd4
|
Fix hydrogen not burning right (with and without realistic heat), allow h2 to burn at all temps while still allowing fusion to work correctly
|
2012-10-26 15:12:13 +01:00 |
|
jacob1
|
c58a3fb2dc
|
TSNS doesn't detect things with an equal temp (fixes detecting wires)
|
2012-10-26 15:11:59 +01:00 |
|
jacob1
|
b84460d79b
|
visual studio compatibility, plus change text a little
|
2012-10-26 15:11:43 +01:00 |
|
jacob1
|
3f093c8072
|
VIBR explosion/graphical changes, it now has a while before it explodes after getting to the limit
|
2012-10-26 15:11:22 +01:00 |
|
jacob1
|
cd7ca6d417
|
some VIBR changes/fixes
|
2012-10-26 15:10:50 +01:00 |
|
jacob1
|
04b76a4b48
|
VIBR/BVBR - vibranium. Initial commit, doesn't seem to work yet
|
2012-10-26 15:10:44 +01:00 |
|
Simon Robertshaw
|
0b09d2e0f3
|
Allow TSNS and DTEC to detect photons and other energy particles. Set default TSNS radius to 1 to make it easier to avoid detecting the wire connections
|
2012-10-10 21:27:36 +01:00 |
|
Simon Robertshaw
|
da07c22ee4
|
new elements: DMG (Force bomb) and TSNS (Temperature sensor)
|
2012-10-10 19:29:11 +01:00 |
|
Simon Robertshaw
|
af181faeea
|
Revert "multiple BRCK colors (suggested by Catelite)"
This reverts commit 4a8ae25299e465ab55072dd512b5818881ec5a67.
|
2012-10-05 17:25:04 +01:00 |
|
jacob1
|
774bc08c2c
|
Move LOLZ/LOVE Rule tables into more appropriate location (element file)
|
2012-10-05 16:52:53 +01:00 |
|
jacob1
|
d159467b63
|
LOLZ and LOVE work again
|
2012-10-05 16:33:54 +01:00 |
|
jacob1
|
f19f393e22
|
multiple BRCK colors (suggested by Catelite)
|
2012-10-05 16:33:45 +01:00 |
|
jacob1
|
a16534e782
|
don't let TNT flood fill explode when under other particles (prevents lag)
|
2012-10-05 16:33:24 +01:00 |
|
jacksonmj
|
707c11203e
|
Fix extra BUBW sometimes being produced when CO2 dissolves
|
2012-10-03 15:42:30 +01:00 |
|
Simon Robertshaw
|
b98f5faace
|
Fix photon blending mode
|
2012-10-01 21:54:52 +01:00 |
|
Simon Robertshaw
|
006dfdf596
|
Move PPIP to powered
|
2012-09-29 23:02:22 +01:00 |
|
Simon Robertshaw
|
685be24ffa
|
Remove testing particle from repo
|
2012-09-13 23:01:30 +01:00 |
|
Simon Robertshaw
|
3e0fcc904e
|
Disable JIT for now
|
2012-09-13 11:01:09 +01:00 |
|
jacob1
|
5a91b83875
|
revert changing the lua/sdl includes and min/max changes
|
2012-09-07 00:53:29 +01:00 |
|
jacob1
|
f8f70a3f77
|
Visual studio compatibility
This removes some inlines when using visual studio to compile, uisng TPT_NO_INLINE. It also fixes many other problems visual studio has with the code
|
2012-09-07 00:52:56 +01:00 |
|
jacob1
|
2dcdca2761
|
fix spark color in nothing mode
|
2012-09-07 00:37:53 +01:00 |
|
jacob1
|
24b4b0b187
|
Fix bugs with energy particles in PIPE
|
2012-09-07 00:36:02 +01:00 |
|
Simon Robertshaw
|
58dc2559aa
|
Implement retrieval of element properties
|
2012-08-29 22:04:07 +01:00 |
|
Simon Robertshaw
|
1fb544815f
|
Correct PHOT colour during fusion
|
2012-08-28 15:13:20 +01:00 |
|
Simon Robertshaw
|
14c0ea59a9
|
cold phot doesn't burn things
|
2012-08-28 15:09:32 +01:00 |
|
Simon Robertshaw
|
05e32f1698
|
Fix things melting with heat sim off
|
2012-08-28 15:08:11 +01:00 |
|
Simon Robertshaw
|
4263e3aab7
|
DTEC, generates a spark when something with it's ctype is nearby
|
2012-08-28 14:17:01 +01:00 |
|
Simon Robertshaw
|
29619e9ebf
|
WOOD and PLNT turn grey when hot, bluish when cold
|
2012-08-28 13:19:34 +01:00 |
|
Simon Robertshaw
|
99b2d8d67d
|
Limit SPNG saturation and reduce absorbtion rate for GEL and SPNG with some elements
|
2012-08-28 12:48:50 +01:00 |
|
Simon Robertshaw
|
5ded005b0c
|
Correct proportions of CO2 and WATR when GEL/SPNG is absorbing BUBW
|
2012-08-28 12:40:18 +01:00 |
|
Simon Robertshaw
|
91ec4d1125
|
GEL and SPNG absorb water from more elements and leave behind what the water was mixed width
|
2012-08-28 12:38:18 +01:00 |
|
Simon Robertshaw
|
86fc8e1eb3
|
TPT: Prevent Acid from eating broken glass
|
2012-08-28 12:28:16 +01:00 |
|
Simon Robertshaw
|
1987efd6e5
|
Revert "HYGN now combusts and fuses properly"
This reverts commit ede6876a82 .
|
2012-08-25 16:33:12 +01:00 |
|
Simon Robertshaw
|
9b10f0c390
|
Revert "final fusion fixes"
This reverts commit add4226f31 .
|
2012-08-25 16:32:51 +01:00 |
|
Simon Robertshaw
|
082072a05e
|
OPS: Fix byte order when unpacking 4 byte tmp fields
|
2012-08-25 16:29:27 +01:00 |
|
Simon Robertshaw
|
fb6f36907f
|
PPIP glowing brick in fire mode
|
2012-08-21 14:58:23 +01:00 |
|
Simon Robertshaw
|
b6736f967e
|
Add EMP flash, fixes #137
|
2012-08-21 13:00:31 +01:00 |
|
Bryan Hoyle
|
add4226f31
|
final fusion fixes
|
2012-08-20 17:46:51 -04:00 |
|
Bryan Hoyle
|
ede6876a82
|
HYGN now combusts and fuses properly
|
2012-08-20 16:59:19 -04:00 |
|
Simon Robertshaw
|
51a0fb2d45
|
TPT: Prevent CONV from destroying diamond
|
2012-08-20 16:54:56 +01:00 |
|
Simon Robertshaw
|
b318c3721a
|
TPT: Powered pipe, based on jacob1's commits
|
2012-08-20 16:48:03 +01:00 |
|
Simon Robertshaw
|
fb02d57aca
|
TPT: Fix salt/water proportions when dissolving into DSTW as well
|
2012-08-20 14:08:27 +01:00 |
|
Simon Robertshaw
|
29283b038c
|
TPT: Consistent proportions of WATR and SALT in SLTW (1 SALT + 3 WATR = 4 SLTW)
|
2012-08-20 13:55:11 +01:00 |
|
Simon Robertshaw
|
7fc8d5f388
|
Add missing legacy update function
|
2012-08-20 13:41:03 +01:00 |
|
Savely Skresanov
|
d6fe7fa2c8
|
Basic realistic heat and latent heat support.
|
2012-08-19 20:06:10 +07:00 |
|
Simon Robertshaw
|
ce3bb6f755
|
Element slots default to disabled
|
2012-08-18 17:19:39 +01:00 |
|
Simon Robertshaw
|
2f76c2374d
|
TPT: Give menu color to elements without one (stickmen, TRON, and WARP)
|
2012-08-11 11:57:21 +01:00 |
|
Simon Robertshaw
|
a6b3674f22
|
Fix PIPE, fixes #92
|
2012-08-10 22:30:19 +01:00 |
|
Simon Robertshaw
|
662640c96c
|
Fix previous merge with SOAP.cpp that created a bug in SOAP. add debug lines for PRTI, PRTO, WIFI and lines for SOAP.
|
2012-08-06 16:14:08 +01:00 |
|
Simon Robertshaw
|
0558322709
|
Add icons for erase, improve icons for certain walls, fix issue #45
|
2012-08-04 15:26:55 +01:00 |
|
ntoskrnl
|
baf07e470e
|
Build fixes for FreeBSD
|
2012-08-04 11:32:48 +01:00 |
|
Simon Robertshaw
|
11d2b0eb3c
|
Correct VAC and EXOT colours, issue #49
|
2012-08-03 18:04:18 +01:00 |
|
Simon Robertshaw
|
24006ee44a
|
Grav colour, addresses rest of #41, colour will vary from original TPT
|
2012-08-03 01:40:13 +01:00 |
|
Simon Robertshaw
|
4233bc743c
|
Use HFLM colour data, addresses some of issue #41
|
2012-08-03 01:18:39 +01:00 |
|
Simon Robertshaw
|
8c7755d5d2
|
TPT: Now stickmen can shoot plasma. dc01f09f0e
|
2012-07-25 20:04:47 +01:00 |
|
Simon Robertshaw
|
79727c9193
|
Fix for previous commits
|
2012-07-25 19:47:27 +01:00 |
|
Simon Robertshaw
|
a033fe7e49
|
TPT: Add ptypes.enabled checks to a few more places 61f39f5464
|
2012-07-25 19:42:53 +01:00 |
|
Simon Robertshaw
|
a5d6c56f8c
|
TPT: Salt should only melt ice that is above saltwater freezing temperature 3e1d3cd5a6
|
2012-07-25 19:33:40 +01:00 |
|
Simon Robertshaw
|
f8766201a6
|
TPT: Optimization for GoL, Added brush size and mouse wheel to lua! e7035233fd
|
2012-07-25 19:32:36 +01:00 |
|
Simon Robertshaw
|
76070f99e0
|
TPT: This should fix PLNT lag just a little bit... (mostly after shooting though NEUT) 5f3c10a684
|
2012-07-25 18:46:15 +01:00 |
|
Simon Robertshaw
|
fad2311c36
|
TPT: C5 should not explode when touching cold INSL a925eea52c
|
2012-07-25 18:44:30 +01:00 |
|
Simon Robertshaw
|
67d449df3d
|
Fix typo in EMBR gravity
|
2012-07-25 18:43:19 +01:00 |
|
Simon Robertshaw
|
1e5eba3583
|
TPT: Make VOID and BHOL eat stickmen again 1f4f50682c
|
2012-07-25 18:27:08 +01:00 |
|