Commit Graph
100 Commits
Author SHA1 Message Date
StevenRS11 fd01d4e198 Fixing buildscript 2013-12-16 21:14:28 -06:00
StevenRS11 1931f7988c Merge pull request #107 from CannibalVox/master
Merging Canvox's patch
2013-12-16 18:58:44 -08:00
StevenRS11 7687a77332 Chunkloader fixes 2013-11-12 13:56:52 -05:00
StevenRS11 b818038fd6 Chunkloader fixes 2013-11-12 13:49:43 -05:00
StevenRS11 b18fe877de Fixed commands and rift orientation 2013-11-12 13:16:54 -05:00
StevenRS11 8fbb41a588 fixed commands and rift orientation 2013-11-12 13:08:05 -05:00
StevenRS11 a1628ff341 Fixed monoliths 2013-11-11 22:05:11 -05:00
StevenRS11 8dd1d85e6e Fixed chunkloaders and loading bug 2013-11-11 21:49:47 -05:00
StevenRS11 9b6aefa6ad Fixed assets 2013-11-11 21:42:40 -05:00
StevenRS11 9907ce1ce8 removed debug 2013-11-11 21:40:28 -05:00
StevenRS11 c48e2307c7 Fixed chunk loaders and dim loading bug 2013-11-11 21:39:11 -05:00
StevenRS11 c2bab6cc93 Build 2 2013-11-11 19:19:53 -05:00
StevenRS11 db9f422824 build stuff 2013-11-11 18:33:31 -05:00
StevenRS11 4486ef62fe Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-11-11 18:05:42 -05:00
StevenRS11 51f7e10834 Fixed more packet issues 2013-11-11 17:33:00 -05:00
StevenRS11 5cd5a323e0 Fixed Packet issues 2013-11-11 17:24:20 -05:00
StevenRS11 20ea00a0a7 Fixed packet issue 2013-11-11 16:36:35 -05:00
StevenRS11 841fcffcb1 fixes 2013-11-11 03:41:14 -05:00
StevenRS11 0f49c8c28f Small Fixes 2013-11-11 03:07:55 -05:00
StevenRS11 da608462d7 fixed monolith texture 2013-11-07 00:47:23 -05:00
StevenRS11 6b3b2d6471 Fixed Chunk Loading crash 2013-11-07 00:32:04 -05:00
StevenRS11 bb7cd95dcc Various fixes 2013-11-07 00:28:40 -05:00
StevenRS11 f2f1ee7af9 Finished Sounds 2013-11-06 22:46:55 -05:00
StevenRS11 4a6d166ba5 Finished Textures, starting sound 2013-11-06 22:16:56 -05:00
StevenRS11 51ee6d9c5e Finishing Textures 2013-11-06 19:30:39 -05:00
StevenRS11 bef91e2ce6 Merge pull request #93 from skyboy/master
Fix warnings and most texture things
2013-11-06 15:24:57 -08:00
StevenRS11 b4e0d53509 Not quite 2013-11-06 16:53:14 -05:00
StevenRS11 d849071e8e All non-texture changes made 2013-11-06 16:40:49 -05:00
StevenRS11 52fcfdaf49 Starting update to 1.6.2 2013-11-06 16:01:31 -05:00
StevenRS11 e4ee4a3cee crafting change 2013-11-06 15:46:43 -05:00
StevenRS11 a3b38a2c05 Merge pull request #92 from StevenRS11/master
Merging changes
2013-11-06 12:45:39 -08:00
StevenRS11 e271dd2fda Texture work 2013-11-06 15:43:26 -05:00
StevenRS11 59489f290f Finished Server mode
Also added World Thread
2013-11-06 15:16:07 -05:00
StevenRS11 e3df3cad08 Finished Loading blacklist & forced chunks 2013-11-06 14:27:55 -05:00
StevenRS11 d4fc43482d Fixed possible savedata import bug 2013-11-05 23:06:21 -05:00
StevenRS11 7d13c3afc0 more buildserver2 2013-11-05 21:27:37 -05:00
StevenRS11 a3a6c80fe5 More buildserver 2013-11-05 20:34:39 -05:00
StevenRS11 c39e2b34ab buildserver fixes
thanks deathrat!
2013-11-05 19:43:28 -05:00
StevenRS11 6383c4f5ff Merge remote-tracking branch 'origin/DevBranch' 2013-11-05 18:23:15 -05:00
StevenRS11 a04a266c17 THE UPDATE
Merging months of dev work into master. The update is playable, but
untested.
2013-11-05 18:15:23 -05:00
StevenRS11 df79aafd14 importing old savedata 2013-11-05 18:09:06 -05:00
StevenRS11 1bfc3f2eea Merged Devbranch into master 2013-11-05 13:49:45 -05:00
StevenRS11 a204cbd04e Implemented Loading and Saving 2013-11-05 13:44:24 -05:00
StevenRS11 a0224e8f14 Finished loading savedata 2013-11-05 13:38:16 -05:00
StevenRS11 5873d20f91 Finished Packing DungeonData 2013-11-05 03:34:15 -05:00
StevenRS11 58842048d4 Added dungeonData shell for saving 2013-11-05 02:36:12 -05:00
StevenRS11 69809df4c3 Added versioning to savedata 2013-11-05 00:36:38 -05:00
StevenRS11 b1503be63e Deserializing Savedata completed 2013-11-04 23:57:43 -05:00
StevenRS11 cbfb64622e optimizing door render code 2013-10-18 15:12:52 -04:00
StevenRS11 2f7b713f5e Added custom ambient music to limbo 2013-10-17 22:43:38 -04:00
StevenRS11 9418ed59df Started packing save data. At least it writes 2013-10-17 04:00:32 -04:00
StevenRS11 3376c1d772 Fixed network code
Everything seems to work fine now
2013-10-16 19:48:45 -04:00
StevenRS11 c08fa15f40 Working on server client 2013-10-16 17:17:46 -04:00
StevenRS11 2f98bf91e8 More work on rift remover
Reverted most changes back to SenseiKiwi's code, but fixed it not
raytracing.
2013-10-15 21:11:44 -04:00
StevenRS11 3e74f60807 Working on client/server madness 2013-10-15 20:37:27 -04:00
StevenRS11 be89913263 Merge pull request #90 from agaricusb/patch-1
Fix possible NPE in RiftRegenerator.regenerate()
2013-10-15 15:12:19 -07:00
StevenRS11 7a36e78769 small fixes
Fixed chunkloader bug
Fixed doors not tping non player entites because of orientation
2013-10-15 15:40:37 -04:00
StevenRS11 5bfd40f2b2 Temporary workaround for dungeon resetting 2013-10-09 23:42:55 -04:00
StevenRS11 b0c7c03fc6 Just was trying something 2013-10-09 19:18:36 -04:00
StevenRS11 9420b8edf2 Deleting dungeons is still buggy 2013-10-09 19:07:58 -04:00
StevenRS11 b9bd42a345 Fixed rift remover regression
still need to handle updating the other clients
2013-10-09 16:23:58 -04:00
StevenRS11 e421987338 Finished ResetCommand, first pass on blackList 2013-10-03 23:44:50 -04:00
StevenRS11 69864ea9ad Working on dungeon deletion 2013-10-02 00:52:18 -04:00
StevenRS11 eef5117c04 Readded commands
Also implemented dungeon regeneration
2013-10-01 22:50:43 -04:00
StevenRS11 d046bd88ea Tweaked how dungeons skip around
Dungeons send the player consistently in the direction they *face* now.
Allows for better travel using them, and also ensures that if they die,
they will be farther away.
2013-10-01 16:36:34 -04:00
StevenRS11 ca07a38eff Made respawning in limbo much less nice.
Takes entrance coords and THEN adds the spawnFuzz. Its much closer to
how it used to be.
2013-10-01 16:20:07 -04:00
StevenRS11 491dc3b615 Rift sigs account for special blocks now 2013-09-30 07:07:24 -04:00
StevenRS11 ee35c365e2 complaining 2013-09-30 05:20:00 -04:00
StevenRS11 e859d2c12e readded constructor 2013-09-30 00:59:59 -04:00
StevenRS11 76e564486d Merge branch 'DevBranch' of https://github.com/StevenRS11/DimDoors into DevBranch 2013-09-30 00:58:17 -04:00
StevenRS11 0484040e26 last time 2013-09-30 00:58:14 -04:00
StevenRS11 94bbc2d658 fixed collision 2013-09-30 00:57:27 -04:00
StevenRS11 2203239c81 Merging changes 2013-09-30 00:41:12 -04:00
StevenRS11 f47a9d8b99 Added orientation to linkdata and door regen 2013-09-30 00:21:52 -04:00
StevenRS11 25446453cb Merge pull request #88 from SenseiKiwi/rewrite
Progress on the New Save Format and Minor Fixes
2013-09-11 20:14:50 -07:00
StevenRS11 670b9a2902 Fixed door obstruction check to not trap people 2013-09-11 02:51:49 -04:00
StevenRS11 78785047af Gold door completed, doors check for obstructions 2013-09-11 00:22:16 -04:00
StevenRS11 08b36054ce Gold dim door working
Needs to gen the right type of door.
2013-09-10 15:50:15 -04:00
StevenRS11 52aa836f75 Added gold dim doors, fixes
Deleted the sun and adding gold dim doors
2013-09-10 04:32:19 -04:00
StevenRS11 79349e9add Fixed door collision for minecarts 2013-09-09 16:47:47 -04:00
StevenRS11 678b5dac73 Tweaked a bit more 2013-09-09 05:33:21 -04:00
StevenRS11 46fc5a34f2 Fixed excessive scaling on DimDoors 2013-09-09 05:31:00 -04:00
StevenRS11 9d42565452 Revert "Working on render for DimDoors"
This reverts commit 2d085f60b8.
2013-09-09 05:29:53 -04:00
StevenRS11 17450dff60 Revert "OMGOMGOMG"
This reverts commit a368d85b54.
2013-09-09 05:29:44 -04:00
StevenRS11 a368d85b54 OMGOMGOMG 2013-09-09 03:55:07 -04:00
StevenRS11 2d085f60b8 Working on render for DimDoors 2013-09-09 02:28:17 -04:00
StevenRS11 a50650848c Merge pull request #87 from SenseiKiwi/rewrite
Fixed Transdimensional Trapdoor and More
2013-09-08 22:08:07 -07:00
StevenRS11 8dc47e8bef Added rendering effect to dimHatch 2013-09-08 02:49:36 -04:00
StevenRS11 665bcb3a0b Merge branch 'DevBranch' of https://github.com/StevenRS11/DimDoors into DevBranch 2013-09-07 20:22:11 -04:00
StevenRS11 3a63f8965b Merge pull request #86 from SenseiKiwi/rewrite
Progress on Rewrite
2013-09-07 17:22:03 -07:00
StevenRS11 87343b45ee Doors are finally doors, not chests! 2013-09-07 20:20:29 -04:00
StevenRS11 26d4287b49 Merge pull request #85 from SenseiKiwi/rewrite
Partially Fixed Exit Doors
2013-09-06 22:01:58 -07:00
StevenRS11 2ce8dbff7b Merge branch 'DevBranch' of https://github.com/StevenRS11/DimDoors into DevBranch 2013-09-07 00:41:53 -04:00
StevenRS11 ac8c13f81c Removed door re-write for now 2013-09-07 00:41:45 -04:00
StevenRS11 9587f914c2 Respect keepLimboInventory config 2013-09-06 15:43:22 -04:00
StevenRS11 cff13e9bb5 Changed limbo trips to never kill the player
Solves the player not getting inventory back, especially for special
slots.
2013-09-06 15:36:12 -04:00
StevenRS11 6512327ee8 Cleaned up door code
More to come, but this helps a little. Should make changing dim door
behavior much easier.
2013-09-06 02:07:47 -04:00
StevenRS11 23efc90765 Merge pull request #84 from SenseiKiwi/rewrite
Rewrite Continued
2013-09-05 19:57:33 -07:00
StevenRS11 ebb92f8f84 Merge pull request #83 from SenseiKiwi/rewrite
Fixed Various Bugs
2013-09-04 22:48:01 -07:00
StevenRS11 4f093751ee Merge pull request #82 from SenseiKiwi/rewrite
Fixed Various Bugs
2013-09-03 21:35:52 -07:00