Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-13 20:37:16 +01:00
Code Issues Projects Releases Wiki Activity
1,437 Commits 7 Branches 130 Tags 27 MiB
5e9ba1e6e3
Commit Graph

392 Commits

Author SHA1 Message Date
FrozenCow
15a8e03e9e Added client-side events to map. 2011-03-21 19:07:30 +01:00
FrozenCow
64733202c0 Merged from flames/master 2011-03-17 22:10:59 +01:00
FrozenCow
082b3577fb Removed jQuery.js (using jQuery from Google now.) 2011-03-17 21:54:32 +01:00
FrozenCow
e4fa4fe015 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 21:43:02 +01:00
Arthur Mayer
2bfbaa241b added forgotten jquery.mousewheel.js 2011-03-17 21:41:24 +01:00
FrozenCow
c13517949b Hides scrollbuttons when they are not needed. 2011-03-17 21:10:35 +01:00
FrozenCow
79c2989b37 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 15:55:24 +01:00
Arthur Mayer
89b66613f0 scrollbutton images 2011-03-17 15:53:14 +01:00
FrozenCow
cc7b33ef47 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 15:46:14 +01:00
Arthur Mayer
954ab689e9 scrollbuttons added and small change for css (because i want it so!) 2011-03-17 15:43:28 +01:00
FrozenCow
5e325d00ea Corrected image references from css. 2011-03-17 15:30:30 +01:00
FrozenCow
2c0717f3d9 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 00:03:05 +01:00
Arthur Mayer
105e2d1829 css for playerlist scrolling. thanks lechd for help. js part comming 
soon :P
 2011-03-16 23:56:04 +01:00
FrozenCow
e281b55c3f Added flatmap-icon. 2011-03-16 14:12:54 +01:00
Jason Booth
2cef9731ed WebChat enhancement and fixes 
Added Spam Message config
Internal server now replies a spam message
Fixed getting webchat-interval to get int rather than double then cast
Fixed holding down "enter" on the empty chat line would spam chat attempts
Fixed so jsonip.appspot query is only done once
 2011-03-15 19:17:58 -05:00
Arthur Mayer
4a2f82a7d6 messagettl for chat also in seconds :) 2011-03-15 23:56:22 +01:00
FrozenCow
29a3391ed8 Merge remote-tracking branch 'kilandor/master' 2011-03-10 12:03:56 +01:00
Jason Booth
d296724755 Fix client side timestamp problem 
Added Support for standalone webchat by reading a json file
Fix for jsonfile-interval in code
Added working php script with spam prevention, for webchat
 2011-03-10 00:11:43 -06:00
Jason Booth
965686d44c Cleanup Moved CSS and JS to matching folders 2011-03-09 17:43:24 -06:00
Arthur Mayer
363339c632 important fix for css, forgotten in my last commit, FrozenCow, please 
pull
 2011-03-09 17:36:15 +01:00
FrozenCow
d98fe89c42 Fixed not being able to follow players. 2011-03-08 01:22:03 +01:00
FrozenCow
b985a55b92 Changed chat-mechanism a bit. 2011-03-07 22:07:34 +01:00
FrozenCow
072924a2a5 Renamed embedded.css to embedded_example.css. 2011-03-07 21:04:37 +01:00
Arthur Mayer
07010f36ac another fix 2011-03-07 08:14:41 +01:00
Arthur Mayer
fe93d372ab css fixes, allow to use dynmap embedded into a website or standalone. 2011-03-07 08:10:30 +01:00
Arthur Mayer
f4ba02cd23 fix, json has boolean, so checking for boolean and not string. 
thanks dashkal for testing that
 2011-03-07 07:48:46 +01:00
Arthur Mayer
32fdf9da86 added option to disable webchat input 2011-03-07 07:07:48 +01:00
Arthur Mayer
689df03b78 merged latest changes, added ability to embed dynmap into a website. 2011-03-07 03:45:42 +01:00
FrozenCow
f3c90f0aae Added prefix to flatmap. 2011-03-06 14:45:26 +01:00
FrozenCow
803867fbc9 Fixed unfollowing when panning to another player. 2011-03-05 17:43:41 +01:00
FrozenCow
a4564889df Fixed map-icons. 2011-03-05 17:42:07 +01:00
FrozenCow
c1603f1060 Changed skin url from minecraft.net to s3.amazonaws.com. 2011-03-01 18:21:15 +01:00
FrozenCow
d54532d899 Merge remote-tracking branch 'flames/master' 2011-03-01 02:01:51 +01:00
FrozenCow
f4f4a33b8b Implemented FlatMap fullrender + required clientlib. 2011-03-01 01:59:33 +01:00
Arthur Mayer
d200b0b8c5 moved all images to separate folder 2011-03-01 00:01:35 +01:00
FrozenCow
9fea1eafdb Added shitty-looking top-down flat map. 2011-02-28 19:26:05 +01:00
FrozenCow
686331d1a5 Better error status message. 2011-02-28 19:23:25 +01:00
FrozenCow
a04215be8f Alertbox does not open when opening page anymore. 2011-02-26 21:33:02 +01:00
FrozenCow
1e04d10b35 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow
e6d2c4932a Reverted back to "== '13'" like flames suggested before. This seemed to raise incompatiblities for Firefox and Safari on Mac, not on Linux. 2011-02-24 00:38:46 +01:00
FrozenCow
9a32485ca9 Small cleanup. 2011-02-24 00:16:10 +01:00
FrozenCow
20e954b905 Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
Arthur Mayer
b6ec0a2955 lechd updated override example 2011-02-23 23:28:28 +01:00
Arthur Mayer
cdd30d95c5 lechd's new override style to let the sidebar always open and hides 
also the icon
 2011-02-23 23:03:26 +01:00
Arthur Mayer
cc0bb3b509 fixed chat sending messages from web. 
event.keyCode === '13', where the strict equal operator seem to break
safari, firefox and chrome (different value types? keydown event seem
not to provide either a string nor an integer)
 2011-02-23 21:26:51 +01:00
FrozenCow
1d2cce6caa Simplified tile-mechanism again (a bit like hMod's version). 2011-02-23 14:06:13 +01:00
FrozenCow
b7f6a5a39d Applied style-change of lechd. 2011-02-23 12:40:05 +01:00
FrozenCow
1cc43637ee Merge remote-tracking branch 'kilandor/master' into nowebserver 
Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js
 2011-02-22 17:58:39 +01:00
FrozenCow
da7da17235 Applied some suggestions by JSLint. 2011-02-22 15:38:49 +01:00
FrozenCow
ccf6f2ac49 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow
b097fb8321 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow
cd4027495c New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
FrozenCow
f80385e1af Added lechd's new images. 2011-02-20 18:47:18 +01:00
Arthur Mayer
02fb226350 removed forgotten comma 2011-02-20 02:02:45 +01:00
Arthur Mayer
d7fe6072a5 a lot of changes. chat and ui related. thanks FrozenCow & lechd 2011-02-20 01:58:53 +01:00
Jason Booth
6ab82174a5 Added timestamp support to Update Tiles and Chat. 
New web config to handle for jsonfile method
Modified webclient to handle timestamps to prevent duplication.
Removed duplicate code in JsonTimerTask.java
 2011-02-19 18:55:01 -06:00
FrozenCow
83f334445b Made chatinput reset after send. 2011-02-19 21:16:14 +01:00
FrozenCow
d5bd6ff038 Made sendmessage url relative. 2011-02-19 21:08:14 +01:00
Arthur Mayer
22cc46f4b8 many ui iprovements by lechd 2011-02-19 20:51:21 +01:00
FrozenCow
77539522f0 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-19 16:31:36 +01:00
FrozenCow
2bd0052aa9 Added WebChat back to web. 2011-02-19 16:31:13 +01:00
Arthur Mayer
9d490cbcc8 removed my custom url, made it relative 2011-02-19 08:26:40 +01:00
Arthur Mayer
61c6f4a086 corrected the json string in sendChat() 2011-02-18 20:15:18 +01:00
Arthur Mayer
56f126d5f2 uups. removed debug alert, added function call 2011-02-18 11:15:05 +01:00
Arthur Mayer
10f93c02c1 added chatSend() function 2011-02-18 10:21:55 +01:00
Arthur Mayer
5ddaf940ed chat interface added, config option changed from showchatballoons: 
ture/false to showchat: balloons/modal
 2011-02-18 07:08:29 +01:00
Arthur Mayer
00485ddcc2 fixed small bug/typo where players were not removed from player list 
at quit game.
 2011-02-18 01:28:58 +01:00
FrozenCow
1388fa11e5 Some desperate attempts to make IE8 work. 2011-02-18 00:07:59 +01:00
FrozenCow
b860c7dd0e Added pinning. 2011-02-18 00:07:51 +01:00
FrozenCow
44748d7f07 Changed gui by lechd + map per world client-configuration. 2011-02-17 20:08:50 +01:00
FrozenCow
060d1092f9 Made clock configurable and split clocks from map. 2011-02-15 13:50:04 +01:00
FrozenCow
18ad2e1d79 Removed copyrights through flames' css. 2011-02-15 13:33:40 +01:00
FrozenCow
5fb098259a focuschatballoons now defaults to false. 2011-02-15 13:08:33 +01:00
Daniel Chesters
24c9dfed41 if focuschatballoons is at false, disableAutoPan should be at true 2011-02-14 21:53:07 +01:00
FrozenCow
a1c86bfabb Removed depricated time-images. 2011-02-14 00:02:52 +01:00
FrozenCow
49d45c653d Made clock and timeofday interchangable. 2011-02-14 00:01:20 +01:00
FrozenCow
42391cc4d5 Readded getMinecraftTime. 2011-02-13 23:30:19 +01:00
FrozenCow
3980ebefa1 Revert "Removed Clock" 
This reverts commit 9ca8f8dc64.
 2011-02-13 23:27:37 +01:00
lishid
058ab0eea7 Transparent compass now 2011-02-13 23:27:37 +01:00
lishid
6e8160e576 Removed Clock 2011-02-13 23:27:37 +01:00
lishid
51e7420bdb Dynamic Time of the day Added 2011-02-13 23:27:37 +01:00
lishid
60ea503053 Added/Modified images 2011-02-13 23:27:37 +01:00
lishid
f894c4945b Added/Modified images 2011-02-13 23:27:37 +01:00
lishid
7241b2be81 Added compass and TimeOfDay 2011-02-13 23:27:37 +01:00
unknown
b729f28df4 initial commit 2011-02-13 23:27:37 +01:00
FrozenCow
db9ced3394 Fixed tiles not updating. 2011-02-13 22:42:08 +01:00
FrozenCow
100f3e0590 Added multiworld update support along with client-side support. 2011-02-13 01:19:47 +01:00
FrozenCow
403a2acc53 Added default player-faces. 2011-02-10 01:20:50 +01:00
FrozenCow
d2b7169884 Workaround for IE's retardness (not yet tested). 2011-02-06 15:09:15 +01:00
FrozenCow
3e398e9124 Made updates in JSON format. Combined chat and tile queues into one UpdateQueue. Fixed UpdateQueue. 2011-02-06 03:00:51 +01:00
FrozenCow
711341ec47 Oops, forgot comma. 2011-02-05 19:51:06 +01:00
FrozenCow
902cc87458 Added 'focuschatballoons' to config influenced by Incendia's suggestion. 2011-02-05 02:59:03 +01:00
FrozenCow
9951baf8b5 Made tiles use nearest-neighbor filtering in Firefox and IE as suggested by lechd. 2011-02-05 02:54:06 +01:00
FrozenCow
fde56275fe Changed day/night time as suggested by lologarithm. 2011-02-02 11:58:14 +01:00
FrozenCow
455b5d3b3e Added showchatballoons, showplayerfacesonmap and showplayerfacesinmenu to configuration. 2011-02-01 15:16:54 +01:00
FrozenCow
1beb4fa466 Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate. 2011-02-01 14:17:08 +01:00
FrozenCow
e47b4dc49f Small fixes to chat-balloons. 2011-01-26 01:05:00 +01:00
Nathan Wolf
18b36f96fe Finish the client-side chat bubble interface: 
- Bubbles disappear automatically after some time
 - Each bubble shows the last 5 messages for each player
 - Some formatting to the bubble done, could be better (add high-res
player pic?)
 2011-01-25 15:10:42 -08:00
Nathan Wolf
f14e097c54 Adding chat message pop-ups! 2011-01-25 14:03:27 -08:00
FrozenCow
676f6c5a3e Made it possible to change background color in style.css 2011-01-23 12:00:15 +01:00
FrozenCow
9ea9e347ea Changed proxy-url to /up/ as ktr suggested. 2011-01-22 14:55:50 -08:00
FrozenCow
75efba1425 Fixed comment in config.js. 2011-01-20 23:29:38 +01:00
FrozenCow
bcb25468db Added aspx for proxying on IIS. 2011-01-20 20:48:00 +01:00
FrozenCow
6205aee3b6 Updated maven buildfile, removed depricated readmes. 2011-01-15 12:13:54 +01:00
FrozenCow
b22a48d5cb Fixed small browser incompatibilities 2011-01-15 02:11:31 +01:00
FrozenCow
b5deec79be Enabled hack for faster rendering when zoomed in, which also fixed a bug that was annoying to fix. 2011-01-15 00:02:03 +01:00
FrozenCow
d594df93ee Fixed little bug. 2011-01-15 00:01:44 +01:00
FrozenCow
dfc051743d Better way of handling inheriting in javascript. 2011-01-14 23:38:50 +01:00
FrozenCow
dfe33efdc3 Made dynmap's javascript self-contained, which allows for multiple maps on a single page. 2011-01-14 20:08:23 +01:00
FrozenCow
c4cce7182a More cleanup. 2011-01-12 02:03:31 +01:00
FrozenCow
d634aede92 Minor cleaups. 2011-01-12 01:45:56 +01:00
FrozenCow
27fb8a20f1 Abstracted clock and tile-updating a bit. 2011-01-12 01:28:45 +01:00
FrozenCow
8263918b8d Abstracted from cave+normal to kzedmaps. Can now have any configurable type of map. 2011-01-10 23:58:39 +01:00
FrozenCow
4b5e6e6f80 Cleaned up client-side tile logic. 2011-01-10 01:28:50 +01:00
FrozenCow
c8a08b5af7 Commented debug-tile-grid. 2011-01-10 00:43:23 +01:00
FrozenCow
ce7bfdb46e Small cleanup. 2011-01-10 00:38:18 +01:00
FrozenCow
a08edc3fa9 Fixed zoomed tile/player not fitting unzoomed. 2011-01-10 00:31:44 +01:00
FrozenCow
2b2891bd0a Readded zoom-tiles. Still needs some work. 2011-01-09 01:12:35 +01:00
FrozenCow
8860eb8c04 Splitted up MapManager. 2011-01-08 03:20:51 +01:00
FrozenCow
80f9435a1a Initial bukket work, now compileable 2011-01-03 23:15:58 +01:00
FrozenCow
3c7f164823 Better browser compatiblity 2011-01-01 19:36:28 +01:00
FrozenCow
6b6979ac3a Fixed browser compatiblity for Firefox with several cleanups, added jQuery and readded follow-boxes. 2010-12-31 13:33:51 +01:00
FrozenCow
e761cff2b8 Added client-side portrait generation. 
Replaced MarkerWithLabel with CustomMarker.
Reworked map.js for easier portrait generation and use of CustomMarker.
 2010-12-28 14:41:44 +01:00
FrozenCow
588e107dc8 Merged clock from svn trunk. 2010-12-27 12:24:03 +01:00
FrozenCow
cbed5c3a01 Separated configuration to config.js. 2010-12-27 11:58:57 +01:00
fescen9
4f151f1841 Merged revisions 37-48 from trunk. 2010-12-17 02:19:56 +00:00
fescen9
7307d1ec27 Added showPlayerNameOnMap to setup to toggle player names. 2010-12-12 23:10:29 +00:00
fescen9
cef6b3bb54 Make player portraits optional on map and in player list. 2010-12-12 23:01:13 +00:00
fescen9
084c1a4925 - Map listens for player login and downloads, crops and resizes the players skin (face only) 
- If the map fails to download a skin for the user, it downloads, crops and resizes the default skin (http://www.minecraft.net/img/char.png)
 - Images are saved to the tile directory so users aren't forced to map another directory, setup permissions, etc...
 - Added one more zoom level (thanks godsyn)
 - Added a map link so you can link people/friends to specific parts of the map (thanks godsyn)
 2010-12-12 20:55:16 +00:00
fescen9
9c585d31b5 Don't add spans to p[0] unless there are 5 items in the array. 
Otherwise it breaks the lastSeen/imgSubstr functionality.
 2010-12-11 23:24:29 +00:00
fescen9
e5c347c8cd Default divs to hidden unless shown by map.js due to item count 2010-12-11 05:15:40 +00:00
fescen9
7a2b1598eb - Markers are now known as "Signs" 
- map-markerpath is now map-signspath (YOU MUST SET THIS TO YOUR CURRENT FILE IF YOU HAVE ONE)
 - Commands have been renamed to: /addsign, /removesign, /listsigns, /tpsign (Update groups.txt if required)
 - New map-showmarkers server.property (comma separated list of options spawn,homes,warps,signs,players or you can set it to all or none; yes, can even hide players but still show warps, spawns, etc...)
 - map-showmarkers directly affects what output via the "up" directory so what you include in your options is included in the data, and ultimately the map
 - Internally, signs are now Warp based so no longer owner based
 - index.html updated to add divs around checkboxes
 - map.js updated to consolidate both players and markers into a single if statement
 - checkboxes dynamically show/hide from the map based on the number of items on the map (will hide if there are none, especially based on map-showmarkers)
 - Player list shows/hides based on number of players (or map-showmarkers setting)
 2010-12-11 04:56:06 +00:00
fescen9
dfbd69f64e - Renamed markers.csv to markers.txt 
- Changed format of markers.txt to colon delimited instead of comma (no need to change anything, plugin will read both types and save in the new format)
- Added support for warps/homes/spawn from data source (either flatfile or mysql)
- Renamed images to be more specific to what they represent (marker = marker.png) for you customizers.
- Added fix to mapUpdate to keep marker/player names from conflicting
 2010-12-10 06:48:09 +00:00
fescen9
cf2f585364 Fixed broken consolidated show/hide code. 2010-12-08 07:32:51 +00:00
fescen9
d6819372e6 Oops, wrong file name for markers/warps. 2010-12-08 07:28:40 +00:00
fescen9
60448dda09 Merge of trunk version 9-19 2010-12-08 07:18:12 +00:00
fescen9
b05fde203e Added control box to show/hide markers/spawns 2010-12-06 02:36:53 +00:00
fescen9
e61997183c Added default.aspx and some readme files 2010-12-06 01:02:57 +00:00
fescen9
04ffed70ea Updated setup section with more clear examples of tileUrl and updateUrl. 2010-12-05 23:58:26 +00:00
fescen9
4bdcb2222a 2010-12-05 23:35:36 +00:00
fescen9
c81cbfeeca 2010-12-05 21:00:52 +00:00
kzed
af18b73908 added fescen9 branch 2010-12-04 13:24:32 +00:00