Commit graph

609 commits

Author SHA1 Message Date
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
agaricusb
66ad5a798f Fix possible NPE in RiftRegenerator.regenerate() 2013-10-06 19:10:04 -07: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
SenseiKiwi
b5973f58eb Deletes IItemDimDoor
Doesn't seem like we need it... and it's in the wrong package. Respect
the packages! õ_Õ
2013-09-11 22:18:24 -04:00
SenseiKiwi
a92cd2fba7 Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-11 22:15:05 -04:00
SenseiKiwi
c2fa4964f8 Progress on New Save Format
Integrated the base code for our new save format. It still needs more
work but at least some substance is there. Ignore the file not found
messages that come up when trying to save the world's data - since we're
not actually writing files, an exception occurs when we some later code
tries to move non-existent save files.

Also moved the FileFilter functionality out of DungeonHelper and into
its own class, FileFilters, since it's finally needed more broadly.
2013-09-11 22:13:42 -04:00
StevenRS11
670b9a2902 Fixed door obstruction check to not trap people 2013-09-11 02:51:49 -04:00
SenseiKiwi
1d3038288b Minor Fix in BlockDimWall
Fixed an issue that skyboy had pointed out long ago about us using
ItemBlock.itemID as a block ID instead of ItemBlock.getBlockID(). That's
potentially hazardous because that function was introduced specifically
so mods could override it and decouple item IDs from block IDs.
2013-09-11 02:30:31 -04:00
SenseiKiwi
6f905050f2 Minor Change
Removed unused import
2013-09-11 01:21:12 -04:00
StevenRS11
78785047af Gold door completed, doors check for obstructions 2013-09-11 00:22:16 -04:00
SenseiKiwi
b73e79e5c2 Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-10 15:51:00 -04:00
StevenRS11
08b36054ce Gold dim door working
Needs to gen the right type of door.
2013-09-10 15:50:15 -04:00