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

234 Commits

Author SHA1 Message Date
jacksonmj
d924a5554a Matrices and vectors, to make coding next commit more pleasant 2011-03-18 19:33:10 +00:00
jacksonmj
56f966b4db Add some arguments to save build/parse functions 
To make clipboard manipulation easier.
 2011-03-18 12:41:36 +00:00
jacksonmj
495eda27a5 Update icon.h to match icon image files 2011-03-18 00:13:56 +00:00
jacksonmj
db91bd37f0 Display photon wavelengths in HUD 2011-03-15 15:47:09 +00:00
jacksonmj
ded7bdf30d Merge branch 'upstream' into dev 
Conflicts:
	src/main.c
 2011-02-26 19:32:51 +00:00
Simon
fd6f6c5406 WIND from cracker! 2011-02-24 17:11:05 +00:00
Simon
5d4d815ad3 Fancier glow, now affected by Velocity, Pressure and Heat 2011-02-23 20:35:02 +00:00
Simon
fa76c4b45c Increase minor version 2011-02-23 17:16:13 +00:00
jacksonmj
c9725c6004 Merge branch 'upstream' into dev 
Conflicts:
	src/main.c
 2011-02-22 15:18:04 +00:00
Simon
ff1aca9524 Update version 2011-02-22 00:15:48 +00:00
Simon
bb0b4e6802 UI improvements for elements menu 2011-02-21 17:57:17 +00:00
jacksonmj
6f2965d0d0 Zoom key conflict with international keyboards 
Change zoom key to only use keysym.sym, like all the other keyboard
controls. This may mean it is no longer the 'z' key on all
systems, but will prevent it conflicting with the
other keyboard controls.
 2011-02-22 00:08:20 +08:00
jacksonmj
ac7eda80a5 Zoom key conflict with international keyboards 
Change zoom key to only use keysym.sym, like all the other keyboard
controls. This may mean it is no longer the 'z' key on all
systems, but will prevent it conflicting with the
other keyboard controls.
 2011-02-20 22:47:08 +00:00
jacksonmj
b3278cf888 Fix some compiler warnings 2011-02-20 20:46:26 +00:00
Simon
1307af5c57 Fix saving of display mode from keys and fix persistent display 2011-02-19 18:59:07 +00:00
Simon
c6e2d17ffe Minor version 2011-02-19 18:36:08 +00:00
jacksonmj
a2091ede76 Move reset code to own function 
Also clear persistent view when loading a save or clearing the screen.
 2011-02-19 15:41:44 +00:00
jacksonmj
d57c5ef5e0 Visual Studio compatibility 
Also fix two compiler warnings
 2011-02-13 00:30:54 +00:00
Simon
3de4d163a5 Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy 2011-02-09 15:56:30 +00:00
Cate
d5fe05d760 "Added Air modes using Gravitymode code" 2011-02-09 23:52:28 +08:00
jacksonmj
6bbc5328fc Sound device not compulsory 2011-02-08 14:30:02 +00:00
jacksonmj
b85c29dee4 Prevent crashes in the event of ridiculous temperatures 2011-02-07 20:29:11 +00:00
jacksonmj
cb74b0bacf Improve console element parsing 
GOL, 34, 2x2 now work. Element types can no longer be referred to by
number, to remove ambiguity between type and particle number.
 2011-02-07 17:13:31 +00:00
Simon
bb3964138c Fix Antimatter 2011-02-04 13:09:48 +00:00
Simon
9469a3b46a Merge with cracker, also fix version 2011-02-04 10:24:35 +00:00
Cracker64
9064cabf28 merge jacksonmj's and much better string parsing because of a function i found. 2011-02-04 01:00:03 -05:00
Cracker64
b6f1ba977c missed some corrections, fixes GoL 2011-02-03 17:28:08 -05:00
Cracker64
fea297b2ac Update with simon, and drawing SPRK on walls crash fix. 2011-01-31 22:53:32 -05:00
Simon
b033a9655d Fix for liquids - jacksonmj 2011-01-31 22:10:34 +00:00
Simon
76e2193318 Fix version for Login 2011-01-31 20:16:12 +00:00
Cracker64
c1ca8bae29 merge jacksonmj's and simon's changes, and made mouse coords show up in debug so it is easier to get them. 2011-01-31 13:12:29 -05:00
Simon
8363a21f23 ALL GLORY TO THE SAVASK 2011-01-31 16:54:13 +00:00
jacksonmj
5bf8755655 Console improvements 
Can use x,y coordinates to specify which particle.
ctype now also accepts element names.
More sanity checking of input.
delete command added.
 2011-01-31 16:36:40 +00:00
Cracker64
b7f768e4b3 Moved console commands into own function. Added running script files so console commands can be run instantly. Added create command. element names work, from jacksonmj. 2011-01-31 00:12:47 -05:00
jacksonmj
cdd7399cc1 Make console recognise element names 2011-01-31 02:42:34 +00:00
jacksonmj
f97990fedd Merge branch 'upstream' into dev 2011-01-30 22:36:15 +00:00
Cracker64
8ed2947b4c update with latest 2011-01-30 16:46:50 -05:00
Simon
8510421b37 Merge with crackers console 2011-01-30 20:05:47 +00:00
Cracker64
fcf958da21 added 'load' command, and a basic error message. 2011-01-30 15:00:54 -05:00
Cracker64
e18337a70a Added a console! it is pretty self explanitory 2011-01-30 01:23:24 -05:00
Simon
f391b896d4 Use Sessions instead of saving password 2011-01-29 12:16:13 +00:00
jacksonmj
5d34cae2e4 Consistent use of NGOL, better NSCN description 2011-01-29 11:20:34 +00:00
jacksonmj
9938378c0d Merge remote branch 'cracker64' into dev 
Conflicts:
	includes/element.h
	includes/powder.h
	src/elements/firw.c
	src/elements/legacy.c
	src/elements/phot.c
	src/elements/sprk.c
	src/graphics.c
	src/main.c
	src/powder.c
 2011-01-29 10:50:43 +00:00
Cracker64
4b5337c03a finally fixed visual studio compiling, yay 2011-01-28 21:57:20 -05:00
Cracker64
964ecf2ecf Other things overwritten, and changes from jacksonmj 2011-01-28 20:13:29 -05:00
Cracker64
880ed33fc7 oops, silly copy file, and fixed the new GoL from simon's fail merging. 2011-01-28 19:58:54 -05:00
Cracker64
bcea95c5ca update to latest 2011-01-28 18:54:50 -05:00
jacksonmj
fe033ce859 INWR should cool after being sparked; and correct function parameters 
Also correct grule size and replicate existing freezing point behaviour for lava
with strange ctypes.
 2011-01-28 23:14:46 +00:00
jacksonmj
a5ff51f5a5 Restore cracker64 changes overwritten by merge 2011-01-28 21:46:40 +00:00
Simon
079d35f1a0 Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy 2011-01-28 19:56:44 +00:00