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

4589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacob1
6efedcdd33 undo authors changes on ctrl+z, prevent excessive nesting 2017-07-15 16:21:16 -04:00
jacob1
5ee10d14e4 reduce unnecessary #include dependency chains 
for example, elements no longer include Client.h or Graphics.h, and interface stuff won't include Window.h or Graphics.h unless requested
 2017-07-13 23:24:35 -04:00
jacob1
781a90a970 CAUS.cpp whitespace fixes, closes #464 2017-07-13 21:07:08 -04:00
jacob1
711d15fe0c fix compile error, blame @moonheart08 2017-07-13 21:02:23 -04:00
moonheart08
a76afb0bfc Add the ability to make POLO from acceleration (#477) 
tmp value of 310+ results in POLO.
 2017-07-13 20:58:18 -04:00
QuanTech0
1ff280acb2 another typo fix... 2017-07-13 20:56:51 -04:00
jacob1
f3a7d966d2 potential fix in sim.partCreate, also 2017-07-13 20:55:03 -04:00
LBPHacker
7dd538b82c Fix tpt.parts being unsafe 
`tpt.parts` does check whether the particle ID it gets is valid, but it doesn't check whether that particle ID is used. One could potentially modify the life property of dead particles to break the linked list of free particle IDs, thus potentially gaining the ability to read from or write to arbitrary addresses in memory.
 2017-07-13 20:33:46 -04:00
jacob1
8e5b0c760e Add logging inside saves which remembers which other saves material was taken from 
The logging is saved inside the bson data in all online saves, local saves, stamps, and clipboard pieces. It is loaded back when reloading each of those.

See #474 for the format of the data. It is the same format for the bson data. Note that "links" is an array of objects. It can be recursive.

There is some effort to not duplicate information, we don't care if you loaded a stamp 10 times or if you are using the clipboard in your own save. Extra information is mostly not saved for your own stuff, only when you take material from other saves.

Press ctrl+a in debug builds to show what info it is currently saving in Client. Also enabled in snapshots for now.

There is one unrelated change in here, which fixes a crash pointed out by QuanTech. It was also save related and it was too close to the other changes to separate it into another commit. It fixes a crash when saving signs with invalid unicode. the BSON library doesn't like this, it was returning an error but we ignored it, which caused a crash. It now notices those errors. I also had to update several Serialize calls to check if it actually returned save data, or else it then would have started crashing there instead.
Also some debug prints were removed
 2017-07-13 00:19:35 -04:00
jacob1
be6ac1d91e workaround for incorrect 404 save 2017-07-01 21:38:57 -04:00
jacob1
057435baa6 Differentiate between created date / updated date in save preview 
still only shows most recent date, this just changes the text
 2017-06-30 21:21:09 -04:00
jacob1
d0f1024f95 add BCOL + NEUT -> SAWD, closes #471 and #472 2017-06-30 20:10:15 -04:00
My main account
284e653aa5 Convert another if-elseif block to switch (#465) 2017-06-30 20:01:12 -04:00
QuanTech0
d0feba6445 Temp. displayed using {aheat} not in celsius 
Since it is displayed in celsius for {t}, shouldn't it be for {aheat} too? Just a consistency thing.
 2017-06-30 19:55:38 -04:00
jacob1
fb08400552 add PROP_LIFE_DEC back to GLOW, fixes #466 2017-06-22 22:50:20 -04:00
jacob1
2e4617c956 GAS+CAUS+pressure = RFRG, move HEAC to solids 2017-06-18 23:32:25 -04:00
My main account
5de384cfbc Fix CRAY creating FILT 2017-06-18 21:49:47 -04:00
iczero
3336209527 Fix STOR modded element processing 
fixes #460, again
 2017-06-18 09:02:20 -04:00
jacob1
67b87b1dab palette now used for default elements again, with some fixes 
palette now used in VIRS, fixes #460
 2017-06-18 00:08:41 -04:00
jacob1
c1e91260eb fix deco colors being 1 R/G/B value less than they should be 
The proper way would be to divide by 255, but that is slower than >>8. This is a better approximation (or perhaps equivalent?)
 2017-06-17 21:02:52 -04:00
iczero
42b8f52611 Add type for POLO, closes #458 2017-06-17 20:34:57 -04:00
jacob1
714ee8ff65 clear redoHistory memory on exit 2017-06-14 00:16:44 -04:00
jacob1
4214f85599 HEAC now checks for heat insulators 
Also testing c++ stuff, maybe reuse this function for GOLD later
 2017-06-14 00:04:44 -04:00
jacob1
d8edb3c2e0 make sure STKM / other particle graphics aren't drawn over the menus 2017-06-13 10:00:35 -04:00
jacob1
694bc6a9cb new reaction suggested by Skylark: RFRG+NEUT=GAS/CAUS 2017-06-11 23:07:52 -04:00
jacob1
32d834c351 fix VIBR asymmetric heat releasing, fixes #424 2017-06-11 22:47:05 -04:00
jacob1
510c33a986 fix BOMB issue from previous commit that deletes particle #0 
also, code cleanup
 2017-06-11 22:22:30 -04:00
jacob1
5ac66bda75 BOMB: use kill_part instead of delete_part, fixes #432 
this was the only element to use delete_part. Only brush drawing should ever use delete_part
 2017-06-11 22:08:30 -04:00
jacob1
d4a0ff9ac8 draw_image can now draw images with x<0, fixes #433 
this isn't used at all in the source
 2017-06-11 22:01:11 -04:00
jacob1
0ea5c1d0e0 Fix #438 
I didn't actually notice any difference with this change
 2017-06-11 21:26:42 -04:00
jacob1
1718fe9287 HEAC is now meltable via LIGH, fix HEAC hardness, fixes #441 2017-06-11 21:10:19 -04:00
jacob1
fb2431d99e replace some if-else with switch statements, code formatting, closes #444 2017-06-11 20:39:23 -04:00
jacob1
81259c5d11 remove PROP_LIFE_DEC from some elements that don't need it, closes #447 2017-06-11 11:29:42 -04:00
LBPHacker
2c0468ef2e Sign justification is now called pointer alignment 2017-06-09 23:58:06 -04:00
cppxor2arr
12d2af7925 Removed unnecessary CleanString() function (#443) 
Two `CleanString()` functions with the only differing thing the first parameter (`const char*` vs `std::string`); removed the one with `const char*` since `std::string` can be constructed with `const char*`.
 2017-06-09 23:57:12 -04:00
jacob1
3d9d57e0ff don't allow loging in using email as username 
(actually, just don't allow @ in usernames)
 2017-06-09 23:54:43 -04:00
jacob1
25b3244d6c add warning messages when certain words are found in comments 2017-06-09 22:19:54 -04:00
jacob1
4242e38968 update LSNS description + default temp 2017-06-04 21:56:12 -04:00
jacob1
1cb3917fcc Fix comment 2017-06-04 21:33:45 -04:00
jacob1
d73586c566 POLO fix (I can't count) 2017-06-04 19:46:59 -04:00
jacob1
2dbdc3109b new element description updates 2017-06-04 18:29:35 -04:00
jacob1
572e432045 update snapshot save restriction code 2017-06-04 18:10:07 -04:00
jacob1
35ce9570d6 make Mrprocom's name blue 2017-06-04 17:48:31 -04:00
jacob1
48a95ac5d5 more POLO fixes 2017-06-04 17:26:56 -04:00
jacob1
53bb1f4802 file renaming / deletion, code cleanup 2017-06-04 17:26:56 -04:00
moonheart08
649133ff41 Removed unneeded comments 2017-06-04 17:26:56 -04:00
moonheart08
94eb0a8ec2 Replace E182 with a real, functional element. 
Implemented Polonium!
 2017-06-04 17:26:56 -04:00
jacob1
1fb883a450 replace E181 with SAWD (sawdust), created by hitting WOOD with high velocity particles 2017-06-04 14:50:14 -04:00
jacob1
06b2631f8d rename E180 to HEAC (rapid heat conductor), now affects photons, code formatting 2017-06-04 12:56:25 -04:00
jacob1
fb1622da41 minor bugfix, this is a test 
TESTING 123
 2017-06-03 18:11:17 -04:00