Felix Wallin
307e329dd7
forgot one file
2010-09-27 12:56:56 +02:00
Felix Wallin
9ca6983e35
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
2010-09-27 12:56:23 +02:00
Felix Wallin
07283c6f55
Try to automerge with this, haha
2010-09-27 12:55:39 +02:00
Felix Wallin
99e2782ebc
Try to automerge with this, haha
2010-09-27 12:54:56 +02:00
Felix Wallin
58d710b224
layout change
2010-09-27 12:53:05 +02:00
Alex
1401817f21
fixed fuse bug
2010-09-26 19:28:18 -04:00
Alex
5b9e554360
fixed BCOL and COAL bug
2010-09-26 19:22:27 -04:00
Alex
82764a9dac
done merging
2010-09-26 17:51:08 -04:00
Alex
9c60901ef6
use parts[i].tmp instead of bit hacks
2010-09-26 17:28:27 -04:00
Alex
bf534e1514
Added BCOL, changed FUSE->FSEP
2010-09-26 17:14:51 -04:00
Felix Wallin
2d5558491f
astyle again.
2010-09-26 19:50:50 +02:00
Simon
9707323109
Added Powered Clone and Heat Switch
2010-09-26 15:18:03 +01:00
Felix Wallin
0424907d28
atzensty... astyle
2010-09-26 14:00:15 +02:00
Simon
26c67a303e
Gah\!
2010-09-26 12:57:02 +01:00
Alex
7341fd9468
merged!
2010-09-26 04:01:14 -04:00
Alex
ddde608d3e
half done commiting
2010-09-26 03:37:13 -04:00
Simon
3156779da9
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
2010-09-25 19:12:34 +01:00
Simon
c7dab50b51
Add Anti-Matter
2010-09-25 19:11:25 +01:00
FacialTurd
fffb5300d0
2010-09-25 04:07:55 -07:00
Simon
3d6e7f8f62
Fireworks bugfixes
2010-09-24 16:23:29 +01:00
Simon
6d3fe4344f
Few bug-fixes added Fireworks and Cold-flame
2010-09-24 16:07:58 +01:00
Simon
d43b5a4fd8
Fix Thermite and Stickman reload glitch
2010-09-22 16:01:49 +01:00
Simon
c12cdce5b6
UI stuff for history
2010-09-19 17:13:06 +01:00
Felix Wallin
99ae022d55
astyle
2010-09-18 09:52:14 +02:00
Simon
fa099338bb
Fix Coal and DESL
2010-09-17 11:34:24 +01:00
Simon
2ba8be7e49
Improved Thermograph gradient
2010-09-16 17:58:55 +01:00
Simon
423070a8a1
Fix Part_avg function and COAL, temperature signs
2010-09-16 13:37:53 +01:00
Simon
a92da37559
History almost complete, couple of bug fixes
2010-09-13 22:36:43 +01:00
Phil
ebb784de70
Much better interface for eraser. Doesnt deselect current elements.
...
alt-click on the element/type you want erased, it will be light blue.
alt-click in the game will then erase the selected element only.
everything else works normally and uneffected if you dont use it.
2010-09-12 20:34:47 -04:00
Phil
f94986a3ba
updated to simon's latest
2010-09-11 20:17:52 -04:00
Phil
e5e6006bc8
Added element type eraser, right click on the menu section to delete and then on the eraser button. the type to erase will have a light blue box
...
also added two wires, PWPO and PWNE purely for no reason, pressure sensitive wires, just ignore them unless you like it.
2010-09-11 18:15:07 -04:00
Simon
812cf13ed2
Half-Implemented history
2010-09-11 22:11:05 +01:00
Simon
42ec12d02f
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
2010-09-11 11:57:20 +01:00
Phil
a20e247674
New temp saving system, only loads from saves it makes right now, but it allows for much more temp accuracy, less than 1 degree.
2010-09-10 22:18:59 -04:00
Felix Wallin
863be4ae58
no idea what I changed, check commit
2010-09-10 22:48:19 +02:00
Felix Wallin
c083860ea1
added some opengl stuff, strange bug with rendering it tho
2010-09-10 22:33:01 +02:00
Simon
d640bd26d8
Some changes
2010-09-10 21:13:29 +01:00
Felix Wallin
959f3a24c6
added a test blendpixel for opengl. No idea if it works
2010-09-10 22:10:41 +02:00
Felix Wallin
b89be21749
changed temperature of THDR and PLSM
2010-09-10 15:32:49 +02:00
Felix Wallin
89dc0c34c1
fixed LN2 freezing.
2010-09-10 15:28:53 +02:00
Phil
6d70d1fdee
Fixed wall eraser errors and loading of other saves.
2010-09-09 11:55:20 -04:00
Phil
8e3383909b
Added specific element erase, right click on element in menu, then right click on eraser, the one to be erased will have a light blue box around it. works for walls too.
...
changed some wall code because it looks like someone just put random numbers in.
fixed a wall bug
2010-09-08 20:25:19 -04:00
Phil
d28edfa6a9
Fireworks glow in fancy display, fixed some crash errors they could cause.
2010-09-08 00:39:22 -04:00
Phil
eb7206aa30
Fireworks look much better, and random colors for each firework yay!
2010-09-07 20:32:51 -04:00
Felix Wallin
17f7caf5d5
added auto update and build file.. will see if it works
2010-09-07 20:38:08 +02:00
Phil
d7bb4932e6
OMFG fireworks, i think they are cool, right now it only shoots hot colored dust, but it can easily be something else, probably will make a special powder for it to explode later.
2010-09-07 10:03:32 -04:00
Felix Wallin
19cf0df2df
Astyle
2010-09-07 08:39:16 +02:00
Phil
a54f5cb7a7
Fixed some temperature errors in the table, fixed some relative weights, and fixed the names on the sides. Renamed PT_PLEX to PT_C4 to make more sense, fixed ice/snow melting problem. made temp sign say N/A instead of 0 when there is nothing.
2010-09-07 00:00:26 -04:00
Phil
2c4b08696d
updating
2010-09-06 23:10:00 -04:00
FacialTurd
6abf6602b3
2010-09-06 15:07:14 -07:00