mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 01:07:47 +00:00
Code Activity
6109 commits 10 branches 14 tags 26 MiB
Commit graph

6109 commits

This branch
This branch
All branches
Author SHA1 Message Date
NotAdam
289b01dbda fix placing interior housing items 2019-01-14 20:05:27 +11:00
Mordred
b41ac00875 Merge remote-tracking branch 'origin/develop' 2019-01-13 17:45:32 +01:00
Mordred
c63c58353a Merge remote-tracking branch 'origin/develop' 2019-01-13 17:45:32 +01:00
Mordred
f468949df2 Temporary fix for resetting directors. Eventually zoning needs to be streamlined 2019-01-13 17:32:43 +01:00
Mordred
b5ceae58fb Temporary fix for resetting directors. Eventually zoning needs to be streamlined 2019-01-13 17:32:43 +01:00
JeidoUran
8f1a7dd368 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 16:04:26 +01:00
JeidoUran
4ac7340554 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 16:04:26 +01:00
Mordred
51242ce5dc Fixed remaining g_log appearances and fmt usage 2019-01-13 13:19:15 +01:00
Mordred
c57cc0c9e1 Fixed remaining g_log appearances and fmt usage 2019-01-13 13:19:15 +01:00
JeidoUran
a0ddf66e76 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 02:41:42 +01:00
JeidoUran
eddb0bf07c Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 02:41:42 +01:00
Mordred
06e214956c Mobs spawn with randomized rotation and are actually targetable now 2019-01-13 00:51:31 +01:00
Mordred
676e350388 Mobs spawn with randomized rotation and are actually targetable now 2019-01-13 00:51:31 +01:00
Mordred
b0760043c3 Fixed tell, fixed examine, fixed equipping gear, fixed itemlevel 2019-01-12 22:53:16 +01:00
Mordred
87dcbd87fd Fixed tell, fixed examine, fixed equipping gear, fixed itemlevel 2019-01-12 22:53:16 +01:00
JeidoUran
32681553a9 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-12 14:34:18 +01:00
JeidoUran
465d167fbd Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-12 14:34:18 +01:00
Mordred
f805eb3485 SightseeingMask fixed in initui 2019-01-12 11:22:30 +01:00
Mordred
f2080a6cbf SightseeingMask fixed in initui 2019-01-12 11:22:30 +01:00
Mordred
55e47a4b34 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-12 10:48:05 +01:00
Mordred
6f1634c9ef Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-12 10:48:05 +01:00
Mordred
2d770211b5 Linux build fix 2019-01-12 10:47:45 +01:00
Mordred
ddbc93c500 Linux build fix 2019-01-12 10:47:45 +01:00
Mordred
af1bb0fa7f Merge pull request #478 from BiscuitUmU/develop 
Updated GMCommand2 Def
 2019-01-12 09:24:44 +01:00
Mordred
f2b45714c0
Merge pull request #478 from BiscuitUmU/develop 
Updated GMCommand2 Def
 2019-01-12 09:24:44 +01:00
JeidoUran
a45685b4e5 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-12 04:15:43 +01:00
JeidoUran
f0316d14e3 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-12 04:15:43 +01:00
Biscuit
3b97971c30 Updated GMCommand2 Def 
Added worldId to the def since you can now Player@WorldName, this also fixes GM2 Commands not working
 2019-01-12 13:18:58 +11:00
Biscuit
a2903a4652 Updated GMCommand2 Def 
Added worldId to the def since you can now Player@WorldName, this also fixes GM2 Commands not working
 2019-01-12 13:18:58 +11:00
Mordred
ea7b104a73 InitUI almost fully fixed. 2019-01-12 00:19:23 +01:00
Mordred
3413aeaf78 InitUI almost fully fixed. 2019-01-12 00:19:23 +01:00
Mordred
d2dc84fa83 Merge pull request #477 from NotAdam/develop 
some 4.5 fixes for housing
 2019-01-10 16:57:18 +01:00
Mordred
dd381b16d5
Merge pull request #477 from NotAdam/develop 
some 4.5 fixes for housing
 2019-01-10 16:57:18 +01:00
NotAdam
d3e6514af1 change itemcontainer back to use u8s for slots, some cleanup 2019-01-10 22:01:58 +11:00
NotAdam
0c672c4bb9 change itemcontainer back to use u8s for slots, some cleanup 2019-01-10 22:01:58 +11:00
NotAdam
a1b4f98032 slightly change behaviour for items that can't be loaded for a house 2019-01-10 21:08:19 +11:00
NotAdam
746b6109a6 slightly change behaviour for items that can't be loaded for a house 2019-01-10 21:08:19 +11:00
NotAdam
c1f7d9ddef cleanup old setrot calls using float -> u16 2019-01-10 20:50:16 +11:00
NotAdam
61ae4cb887 cleanup old setrot calls using float -> u16 2019-01-10 20:50:16 +11:00
NotAdam
6e6ffc7cf3 fix housing object init structure, game no longer crashes/doesn't load 2019-01-10 20:38:27 +11:00
NotAdam
25023e2ed1 fix housing object init structure, game no longer crashes/doesn't load 2019-01-10 20:38:27 +11:00
NotAdam
22e73a0da8 additional playerspawn fields and fix logging into housing zones 2019-01-10 17:34:22 +11:00
NotAdam
93df29e22e additional playerspawn fields and fix logging into housing zones 2019-01-10 17:34:22 +11:00
NotAdam
c03dc6dc80 initial pass to fix housing issues 2019-01-10 15:03:25 +11:00
NotAdam
da40b9e97f initial pass to fix housing issues 2019-01-10 15:03:25 +11:00
Mordred
1cc38c0cca Fixed black screen on new character, fixed servernotice size, initial initui adjustments. 2019-01-09 23:57:49 +01:00
Mordred
cfabc721dd Fixed black screen on new character, fixed servernotice size, initial initui adjustments. 2019-01-09 23:57:49 +01:00
Adam
07d0dc59ea Merge pull request #471 from JeidoUran/crashes_fix 
Several crashes fixed, GM Jump and Call fixed and closer to retail
 2019-01-09 18:58:06 +11:00
Adam
3da3852861
Merge pull request #471 from JeidoUran/crashes_fix 
Several crashes fixed, GM Jump and Call fixed and closer to retail
 2019-01-09 18:58:06 +11:00
Mordred
2a626ebc29 Added a field for bluemage to player 2019-01-08 23:58:14 +01:00