Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #172

Merged
merged 457 commits into from
Nov 19, 2011
Merged

Develop #172

merged 457 commits into from
Nov 19, 2011

Conversation

apathyboy
Copy link
Member

Release time! 24 hours for any last minute deal breakers.

Kyle Craviotto and others added 30 commits October 5, 2011 16:06
some prototyping and initial integration test for factories
36f4139
added missing files
a6f9837
Added in actual create for stored procs
a92b874
create base factory to build the base object
b9fbd99
@dead1ock
Merge pull request #121 from Kronos11/data_layer
2892456 
Data layer
transition existing factories to current method
891347f
added basic creature factory start.
1e1879a
@dead1ock
Merge branch 'data_layer' of github.com:anhstudios/swganh into data_l…
f98ecd5 
…ayer
Added tangible_factory2 to show an example of multiple result sets no…
d13e620 
…t working with prepared statements
We now use the base object factory to just fill in the base object gi…
a9f7f4f 
…ven a result set
Player successfully loaded from db
c938a97
Merge branch 'data_layer' of github.com:anhstudios/swganh into data_l…
6a4651b 
…ayer
added old db entity galaxy manager for reference
c7cc62e
Cleaned up SQL Directory, tweaked old db setup script and added indiv…
74486b6 
…idual files per object.
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
ea1b902 
…kronos/data_layer
added procedures
57c630e
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
60b8e79 
…kronos/data_layer
added galaxy_manager procedures and functions
d0a0538
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
dfb0ee1 
…kronos/data_layer
Added procedure to create new accounts
5673b3c
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
e7fd22b 
…kronos/data_layer
create galaxy_manager
eb3053f
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
4c301b0 
…kronos/data_layer
fixed create account sha1 process
8076c0c
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
aaf5ce5 
…kronos/data_layer
concat
281d3d7
@dead1ock
Merge branch 'data_layer' of https://github.com/Kronos11/swganh into …
b38210f 
…kronos/data_layer
@dead1ock
Auto account registration.
686020e
@dead1ock
Merge pull request #123 from Kronos11/data_layer
b266d4e 
Data Factory implementations
@dead1ock
Reauthentication after Auto-Registration.
c69eede
apathyboy and others added 28 commits November 7, 2011 13:01
@apathyboy
Updated Object doxygen docs for assigned types.
5b3b970
@Kronos11
Merge pull request #166 from apathyboy/develop
49ce5d5 
Updated Object doxygen docs for assigned types.
@apathyboy
Now provides a method for updating the client that is controlling an …
f0c1bb0 
…object.
@apathyboy
Updates the client if an existing object controller exists.
ec14344
@Kronos11
Merge pull request #167 from apathyboy/object_resume_control
d91f2ad 
Object resume control
@apathyboy
Updated flag containers to std::array.
66e7b4b
@apathyboy
Handle loading status flags appropriately
cd4caf8
@apathyboy
Updated select statement to get the data appropriatel.y
9fc312a
@apathyboy
Gets the skills via the skill command table, ability_list table not n…
59d660b 
…ecessary.
@apathyboy
Updated get waypoint query
e57f2ed
@apathyboy
Removed unnecessary code.
868abd2
@apathyboy
Merge remote-tracking branch 'origin/player' into player
2687f7f
@Kronos11
Merge pull request #168 from apathyboy/player
ff9c58d 
Player
@apathyboy
Made the mutex mutable to maintain const correctness in public interf…
c83c6c6 
…aces.
@apathyboy
Added PvP status functions.
8859afc
@apathyboy
Provide subclasses an opportunity to send more messages on make clean.
f75d988
@apathyboy
Moved pvp status to creature as its based on the creature id.
5514443
@apathyboy
Remove LD state when logging in.
7c52bf5 
Made note to move this to a PlayerService in a near future refactor session.
@Kronos11
Merge pull request #169 from apathyboy/player
268723e 
Pvp Update Message
@apathyboy
Added ObjectEvent, a simple data event that can be used to package an…
d3821c1 
… object with an event message.
@apathyboy
Added static header to controller messages
8e284fe
@apathyboy
Trigger "ObjectReadyEvent" when CmdSceneReady is received.
5e173c5
@apathyboy
Added Send*Message helpers for sending movement related messages.
880a276 
Now listens for "ObjectReadyEvent" and sends out a data transform.

@todo Need to load up static building/cells in order for cell movement to work.
@Kronos11
Merge pull request #170 from apathyboy/north_bug
c71b3e7 
North bug
@apathyboy
Disabled cell movement
348d31e
@apathyboy
Merge pull request #173 from apathyboy/develop
3b51652 
Disabled cell movement
@apathyboy
Now remove contained objects from the scene when destroying an object
72ac43d
@apathyboy
Merge pull request #174 from apathyboy/develop
acb9f00 
Now remove contained objects from the scene when destroying an object
apathyboy added a commit that referenced this pull request Nov 19, 2011
@apathyboy
Merge pull request #172 from anhstudios/develop
802988e 
Develop
@apathyboy apathyboy merged commit 802988e into master Nov 19, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@apathyboy @dead1ock @Kronos11