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

440 Commits

Author SHA1 Message Date
Simon
064579c9e4 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-02-21 16:10:05 +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
1419337374 Reduce overlap of HUD text when in debug/beta mode 
Also reduce duplication of some HUD code
 2011-02-22 00:08:20 +08:00
jacksonmj
dc35feeac9 Fix console preventing window from closing 2011-02-22 00:05:52 +08:00
Simon
9002a87d61 Notication of authentication improvement 2011-02-19 19:28:39 +00:00
Simon
1307af5c57 Fix saving of display mode from keys and fix persistent display 2011-02-19 18:59:07 +00:00
jacksonmj
72e6fdd9f6 Preventing creation of invalid types also prevented use of air/temp tools 2011-02-19 07:07:08 +08:00
jacksonmj
df8c13cc58 create_box improvements 
Boxes now have sharp corners - they fill only the specified rectangle and not 1 pixel extra
on all sides.
 2011-02-19 07:06:22 +08:00
jacksonmj
81ce5d74cc Crash when element with invalid type is created 
Generally due to an invalid ctype for clone.
 2011-02-19 07:06:22 +08:00
jacksonmj
1b23302513 FLAG_STAGNANT usage lost during rewrite 2011-02-19 07:06:21 +08:00
jacksonmj
dab9f85024 Fix incorrect liquids movement 2011-02-19 07:06:21 +08:00
Cracker64
7c123cdb00 NEUT fixed to dust and fwrk reaction. 2011-02-19 07:04:54 +08:00
Cracker64
89b19bcbee NEUT fixed to dust and fwrk reaction. 2011-02-17 19:03:14 -05:00
Cracker64
b08c37342b Commands in signs, some don't fit 2011-02-14 20:32:01 -05:00
Simon
809289b13d ALL GLORY TO THE SAVASK 2011-02-13 14:38:42 +00:00
Simon
e6ab5b0f36 Fix Clickable signs 2011-02-13 14:03:06 +00:00
Simon
b0b736d49e Moved Gravity identifiers, added gravity mode and air mode to save format 2011-02-13 13:42:38 +00:00
jacksonmj
d57c5ef5e0 Visual Studio compatibility 
Also fix two compiler warnings
 2011-02-13 00:30:54 +00:00
Cracker64
e882dfecf9 update with latest 2011-02-10 19:46:34 -05:00
jacksonmj
457ceeff0a BCLN and GOO advection fix 2011-02-09 17:19:48 +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
7c100f29c0 gol2 not resetting properly 
Causes life to malfunction severely in some cases
 2011-02-08 22:32:06 +00: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
jacksonmj
29bd6e42f5 Correct some fancy mode graphics 2011-02-07 16:19:14 +00:00
jacksonmj
5fbb37ba60 Fix console particle number, coordinate parsing 2011-02-07 15:56:10 +00:00
jacksonmj
ee100cb4f0 Fix GoL deleting particle 0 2011-02-07 15:24:08 +00:00
jacksonmj
6749eb1960 More flood_parts fixes 
kill_part needs to update photon map, otherwise delete_part keeps
deleting the same photon, leading to infinite flood_parts recursion.
 2011-02-06 20:24:20 +00:00
Cracker64
30d86813fc hidden menu shows up correctly 2011-02-06 13:29:37 -05:00
jacksonmj
e791e21c3e Fix x,y not always updating and particle # not showing when BETA defined 2011-02-06 17:52:35 +00:00
Cracker64
9844636593 particle # shows up again 2011-02-06 12:50:04 -05:00
jacksonmj
b7e50f521c Fix flood_parts crashes 
Crashes due to infinite recursion in flood_parts, which seemed to be caused by
the pmap being incorrect.
 2011-02-06 17:16:49 +00:00
FacialTurd
3a4b7f6983 Uninitialised pointer segfault if not previously logged in - jacksonmj 2011-02-06 04:41:48 -08:00
jacksonmj
21d0dd0ca2 Better text wrapping 2011-02-05 15:44:29 +00:00
jacksonmj
196ccd1e36 Uninitialised pointer segfault if not previously logged in 2011-02-04 20:53:15 +00:00
jacksonmj
2569d244d4 Merge branch 'upstream' into dev 
Conflicts:
	src/powder.c
 2011-02-04 19:59:50 +00:00
Simon
0d863dce94 Nobody likes extra line breaks] 2011-02-04 12:17:24 +00:00
Simon
aef66fbfe3 Session checking on startup and compatibility fixes 2011-02-04 12:16:45 +00:00
Simon
dd5ca12223 We don't want any buffer overflow, especially when reading file and user input 2011-02-04 11:42:11 +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
1755f08e44 variables and if statements for scripts, GoL is glitchy for me, i don't know why 2011-02-03 16:38:58 -05:00
jacksonmj
d21d1f7ba5 Merge branch 'upstream' into dev 2011-02-03 18:47:23 +00:00
Simon
525a59e280 Fixes from cracker64, also lolsounds 2011-02-03 15:37:55 +00:00
jacksonmj
54caad7a69 Possible fix for liquids transferring spark through INSL 2011-02-03 12:04:11 +00:00
jacksonmj
8aaaae1daf Make PTCT/NTCT cool down even when covered with spark 
Also fix typo in update_PHOT
 2011-02-03 00:08:56 +00:00
jacksonmj
5b1210714d More fixes 
Fix PHOT and FWRK.
Fix QRTZ conductivity (broken by removing PROP_CONDUCTS)
Add some things lost during rewrite: NTCT/PTCT not heated if INSL in the way;
boiling point varies with pressure.
 2011-02-02 17:49:56 +00:00
Cracker64
db038e9643 HERE are the doubled memsets 2011-02-02 00:18:22 -05:00
Cracker64
2fb7c944cd fix a few things, some memsets were doubled. 2011-02-02 00:15:57 -05:00
Cracker64
5383311cba testing playing .wav files. lol sounds 2011-02-01 20:35:41 -05:00
jacksonmj
77bcac1a56 Small fixes 
Fix nearest_part distance calculation
Rename air constants to avoid PLOSS clash with math.h
Prevent crashes due to bad lava ctype.
 2011-02-01 16:06:48 +00:00
Cracker64
c558df240b made set work with all of one type of a particle (set type dust deut) turns all dust into deut 2011-01-31 23:30:53 -05:00
Cracker64
fea297b2ac Update with simon, and drawing SPRK on walls crash fix. 2011-01-31 22:53:32 -05:00
Simon
c78d4203ee Small changes from cracker 2011-01-31 22:17:44 +00:00
Simon
b033a9655d Fix for liquids - jacksonmj 2011-01-31 22:10:34 +00:00
jacksonmj
d52fa30a45 Attempt fix for liquids 2011-01-31 22:00:12 +00:00
Simon
5ec884993f Fix login for non-elevated users 2011-01-31 20:25:27 +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
jacksonmj
363a3e38f1 Merge branch 'cracker64' into dev 
Conflicts:
	src/interface.c
	src/main.c
 2011-01-31 14:05:05 +00:00
Cracker64
3babc0586c stupid git, didn't take description change 2011-01-31 00:49:50 -05: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
f85ef31b1f Merge branch 'upstream' into dev 2011-01-31 02:25:55 +00:00
Simon
61292f5355 Fix bugs with console. 2011-01-30 23:20:12 +00:00
Cracker64
6aaa9e78cd possible fix from jacksonmj, cursor gets set to end while changing commands with up/down 2011-01-30 18:15:53 -05:00
jacksonmj
e2b916a91f Console segfault fix 
ed.str is deallocated when console_ui returns. Dereferencing the
returned pointer to ed.str therefore results in bad things.
 2011-01-30 22:37:59 +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
bcbcb0063b Command buffer, limit is 9, I think 2011-01-30 21:38:24 +00:00
Simon
c6db32f829 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-01-30 20:11:10 +00: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
FacialTurd
d61efca4e5 Missing header for CM_COUNT 2011-01-29 09:42:01 -08:00
Simon
7522e95a9d Missing file, also fix cmode saving 2011-01-29 12:19:48 +00: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
01304db892 fix some visual studio issues. 2011-01-28 20:53:02 -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
jacksonmj
bdfbc7c409 Change include file for element update functions 2011-01-28 19:36:26 +00:00
jacksonmj
2654996599 Fix disappearing WTRV 
If water is sparked then quickly heated past 100C, the resulting
WTRV will disappear after a few frames.
 2011-01-27 22:38:47 +00:00
Simon
e9ae32b0cc Merge with jacksonmj, Warning: potential for lot of bugs 2011-01-27 20:32:34 +00:00
jacksonmj
58a700fbb0 Fix SIGFPE when opening creations with exactly 50 up/down votes 
Only occurs on optimised (using $(OFLAGS) in Makefile) builds
 2011-01-23 15:40:01 +00:00
Cracker64
60d3f0047b quartz shouldn't have prop_conducts, and fixed visual studio compiling 2011-01-20 14:10:34 -05:00
Cracker64
e7f2eb92c5 ctrl-'=' will reset sparks 2011-01-19 17:56:55 -05:00
Cracker64
b25a6ecd59 some photon fixes, and better resets on reload/clear 2011-01-19 16:24:54 -05:00
Cracker64
1b35811bd4 revert all limit changes, a little too glitchy, can be done later when current limit is reached. 2011-01-19 14:25:56 -05:00
Cracker64
ff01973658 made all the shifts and type checks use defines, so it can be changed easier, and put it back to normal with a shift of 8. 2011-01-19 13:48:59 -05:00
Cracker64
5c65d69dac missed some bitshifts, which caused a few glitches. Everything seems normal 2011-01-18 00:45:14 -05:00